Wolfenstein 3D:

- Added missing sources
- The window now opens in the center of the screen.

git-svn-id: svn://kolibrios.org@8596 a494cfbc-eb01-0410-851d-a64ba20cac60

contrib/games/wolf3d/Makefile

@@ -9,11 +9,12 @@ LDFLAGS = -static -S -nostdlib -T $(SDK_DIR)/sources/newlib/app.lds --image-base
 INCLUDES = -I$(SDK_DIR)/sources/newlib/libc/include -I$(SDK_DIR)/sources/SDL-1.2.2_newlib/include -I.
 LIBPATH = -L $(SDK_DIR)/lib -L /home/autobuild/tools/win32/mingw32/lib
 
-OBJECTS = wl_cloudsky.o  wl_debug.o  id_sd.o  wl_play.o  id_vl.o  wl_act2.o  wl_floorceiling.o  wl_dir3dspr.o  wl_state.o  wl_atmos.o  id_in.o  signon.o  wl_parallax.o  wl_agent.o  sdl_winmain.o  wl_inter.o  wl_text.o  id_pm.o  wl_draw.o  wl_menu.o  wl_game.o  wl_act1.o  wl_main.o  wl_shade.o  id_us_1.o  id_vh.o  id_ca.o  joystick_stub.o
+OBJECTS = wl_cloudsky.o  wl_debug.o  id_sd.o  wl_play.o  id_vl.o  wl_act2.o  wl_floorceiling.o  wl_dir3dspr.o  wl_state.o  wl_atmos.o  id_in.o  signon.o  wl_parallax.o  wl_agent.o  sdl_winmain.o  wl_inter.o  wl_text.o  id_pm.o  wl_draw.o  wl_menu.o  wl_game.o  wl_act1.o  wl_main.o  wl_shade.o  id_us_1.o  id_vh.o  id_ca.o  joystick_stub.o kolibri.o
 
 default: $(OBJECTS)
 	kos32-ld $(LDFLAGS) $(LIBPATH) --subsystem native -o wolf3d $(OBJECTS) -lSDLn -lsound -lstdc++ -lsupc++ -lgcc -lc.dll
 	objcopy wolf3d -O binary
+	kpack --nologo wolf3d
 
 %.o : %.cpp
 	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<

contrib/games/wolf3d/kolibri.cpp

@@ -0,0 +1,15 @@
+#include <SDL.h>
+#include <kos32sys.h>
+#include <stdlib.h>
+ 
+void kolibri_set_win_center()
+{
+    struct proc_info *info = (struct proc_info*)malloc(sizeof(struct proc_info));
+    get_proc_info((char*)info);
+    
+    pos_t screen_size= max_screen_size();
+    int new_x = screen_size.x/2-info->width/2;
+    int new_y = screen_size.y/2-info->height/2;
+    sys_change_window(new_x,new_y, -1, -1); 
+    free(info);
+}

contrib/games/wolf3d/mame/fmopl.h

@@ -0,0 +1,114 @@
+#ifndef __FMOPL_H_
+#define __FMOPL_H_
+
+#define HAS_YM3812 1
+
+/* --- select emulation chips --- */
+#define BUILD_YM3812 (HAS_YM3812)
+#define BUILD_YM3526 (HAS_YM3526)
+#define BUILD_Y8950  (HAS_Y8950)
+
+/* select output bits size of output : 8 or 16 */
+#define OPL_SAMPLE_BITS 16
+
+/* compiler dependence */
+#ifndef OSD_CPU_H
+#define OSD_CPU_H
+typedef unsigned char	UINT8;   /* unsigned  8bit */
+typedef unsigned short	UINT16;  /* unsigned 16bit */
+typedef unsigned int	UINT32;  /* unsigned 32bit */
+typedef signed char		INT8;    /* signed  8bit   */
+typedef signed short	INT16;   /* signed 16bit   */
+typedef signed int		INT32;   /* signed 32bit   */
+
+typedef int BOOL;
+#endif
+
+#if (OPL_SAMPLE_BITS==16)
+typedef INT16 OPLSAMPLE;
+#endif
+#if (OPL_SAMPLE_BITS==8)
+typedef INT8 OPLSAMPLE;
+#endif
+
+
+typedef void (*OPL_TIMERHANDLER)(int channel,double interval_Sec);
+typedef void (*OPL_IRQHANDLER)(int param,int irq);
+typedef void (*OPL_UPDATEHANDLER)(int param,int min_interval_us);
+typedef void (*OPL_PORTHANDLER_W)(int param,unsigned char data);
+typedef unsigned char (*OPL_PORTHANDLER_R)(int param);
+
+
+#if BUILD_YM3812
+
+int  YM3812Init(int num, int clock, int rate);
+void YM3812Shutdown(void);
+void YM3812ResetChip(int which);
+int  YM3812Write(int which, int a, int v);
+unsigned char YM3812Read(int which, int a);
+void YM3812Mute(int which,int channel,BOOL mute);
+int  YM3812TimerOver(int which, int c);
+void YM3812UpdateOne(int which, INT16 *buffer, int length);
+
+void YM3812SetTimerHandler(int which, OPL_TIMERHANDLER TimerHandler, int channelOffset);
+void YM3812SetIRQHandler(int which, OPL_IRQHANDLER IRQHandler, int param);
+void YM3812SetUpdateHandler(int which, OPL_UPDATEHANDLER UpdateHandler, int param);
+
+#endif
+
+
+#if BUILD_YM3526
+
+/*
+** Initialize YM3526 emulator(s).
+**
+** 'num' is the number of virtual YM3526's to allocate
+** 'clock' is the chip clock in Hz
+** 'rate' is sampling rate
+*/
+int  YM3526Init(int num, int clock, int rate);
+/* shutdown the YM3526 emulators*/
+void YM3526Shutdown(void);
+void YM3526ResetChip(int which);
+int  YM3526Write(int which, int a, int v);
+unsigned char YM3526Read(int which, int a);
+int  YM3526TimerOver(int which, int c);
+/*
+** Generate samples for one of the YM3526's
+**
+** 'which' is the virtual YM3526 number
+** '*buffer' is the output buffer pointer
+** 'length' is the number of samples that should be generated
+*/
+void YM3526UpdateOne(int which, INT16 *buffer, int length);
+
+void YM3526SetTimerHandler(int which, OPL_TIMERHANDLER TimerHandler, int channelOffset);
+void YM3526SetIRQHandler(int which, OPL_IRQHANDLER IRQHandler, int param);
+void YM3526SetUpdateHandler(int which, OPL_UPDATEHANDLER UpdateHandler, int param);
+
+#endif
+
+
+#if BUILD_Y8950
+
+/* Y8950 port handlers */
+void Y8950SetPortHandler(int which, OPL_PORTHANDLER_W PortHandler_w, OPL_PORTHANDLER_R PortHandler_r, int param);
+void Y8950SetKeyboardHandler(int which, OPL_PORTHANDLER_W KeyboardHandler_w, OPL_PORTHANDLER_R KeyboardHandler_r, int param);
+void Y8950SetDeltaTMemory(int which, void * deltat_mem_ptr, int deltat_mem_size );
+
+int  Y8950Init (int num, int clock, int rate);
+void Y8950Shutdown (void);
+void Y8950ResetChip (int which);
+int  Y8950Write (int which, int a, int v);
+unsigned char Y8950Read (int which, int a);
+int  Y8950TimerOver (int which, int c);
+void Y8950UpdateOne (int which, INT16 *buffer, int length);
+
+void Y8950SetTimerHandler (int which, OPL_TIMERHANDLER TimerHandler, int channelOffset);
+void Y8950SetIRQHandler (int which, OPL_IRQHANDLER IRQHandler, int param);
+void Y8950SetUpdateHandler (int which, OPL_UPDATEHANDLER UpdateHandler, int param);
+
+#endif
+
+
+#endif /* __FMOPL_H_ */

contrib/games/wolf3d/wl_main.cpp

@@ -11,7 +11,6 @@
 #include "wl_atmos.h"
 #include <SDL_syswm.h>
 
-
 /*
 =============================================================================
 
@@ -25,7 +24,7 @@
 */
 
 extern byte signon[];
-
+extern void kolibri_set_win_center();
 /*
 =============================================================================
 
@@ -1233,6 +1232,7 @@ static void InitGame()
 #endif
     
     SignonScreen ();
+    kolibri_set_win_center();
     
 #if defined _WIN32
     if(!fullscreen)
@@ -1950,13 +1950,9 @@ int main (int argc, char *argv[])
 #else
     CheckParameters(argc, argv);
 #endif
-
     CheckForEpisodes();
-
     InitGame();
-
     DemoLoop();
-
     Quit("Demo loop exited???");
     return 1;
 }