Commit 6b84adb4 authored by Steven Fuller's avatar Steven Fuller

Very minor changes (mainly a one line fix to wl_text.c)

parent 4b2765d4
CC = gcc CC = gcc
#CFLAGS = -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro CFLAGS = -O6 -fomit-frame-pointer -ffast-math -funroll-loops -mpentiumpro -mcpu=pentiumpro -march=pentiumpro
#CFLAGS = -g -Wall -pedantic #CFLAGS = -g -Wall -pedantic
CFLAGS = -g #CFLAGS = -g
OBJS = objs.o misc.o id_ca.o id_in.o id_sd.o id_vl.o id_vh.o id_us.o \ OBJS = objs.o misc.o id_ca.o id_in.o id_sd.o id_vl.o id_vh.o id_us.o \
wl_scale.o wl_draw.o wl_act1.o wl_act2.o wl_agent.o wl_game.o \ wl_scale.o wl_draw.o wl_act1.o wl_act2.o wl_agent.o wl_game.o \
wl_inter.o wl_menu.o wl_play.o wl_state.o wl_text.o wl_main.o \ wl_inter.o wl_menu.o wl_play.o wl_state.o wl_text.o wl_main.o \
......
...@@ -62,6 +62,7 @@ metaname like sc_Left etc or something ...@@ -62,6 +62,7 @@ metaname like sc_Left etc or something
update once per frame or such.. hm update once per frame or such.. hm
and where is that greenpixel coming from (when using end game with largest and where is that greenpixel coming from (when using end game with largest
window size) window size)
* merge id_vl.c and id_in.c to get id_svga.c
Specific: Specific:
* memory/sound intro screen goes * memory/sound intro screen goes
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
SDMode SoundMode; SDMode SoundMode;
SMMode MusicMode; SMMode MusicMode;
SDSMode DigiMode; SDSMode DigiMode;
word HackCount;
word *SoundTable; word *SoundTable;
word ssPort = 2; word ssPort = 2;
int DigiMap[LASTSOUND]; int DigiMap[LASTSOUND];
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#if WMODE == 0 #if WMODE == 0
/* #define SPEAR */ /* #define SPEAR */
/* #define SPEARDEMO */ /* #define SPEARDEMO */
#define GOODTIMES /* #define GOODTIMES */
#define UPLOAD #define UPLOAD
#elif WMODE == 1 #elif WMODE == 1
......
...@@ -189,7 +189,7 @@ int EpisodeSelect[6]={1}; ...@@ -189,7 +189,7 @@ int EpisodeSelect[6]={1};
int SaveGamesAvail[10],StartGame,SoundStatus=1,pickquick; int SaveGamesAvail[10],StartGame,SoundStatus=1,pickquick;
char SaveGameNames[10][32],SaveName[13]="SAVEGAM?."; char SaveGameNames[10][32],SaveName[13]="savegam?.";
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
......
...@@ -151,7 +151,7 @@ void ParseTimedCommand (void) ...@@ -151,7 +151,7 @@ void ParseTimedCommand (void)
===================== =====================
*/ */
void TimedPicCommand (void) void TimedPicCommand (void)
{ {
ParseTimedCommand (); ParseTimedCommand ();
...@@ -625,8 +625,7 @@ void ShowArticle (char *article) ...@@ -625,8 +625,7 @@ void ShowArticle (char *article)
} }
LastScan = 0; LastScan = 0;
while (!LastScan) while (!LastScan) IN_CheckAck(); /* TODO: update events */
;
switch (LastScan) switch (LastScan)
{ {
...@@ -666,9 +665,9 @@ void ShowArticle (char *article) ...@@ -666,9 +665,9 @@ void ShowArticle (char *article)
//=========================================================================== //===========================================================================
int endextern = T_ENDART1; int endextern = T_ENDART1;
#ifndef SPEAR #ifndef SPEAR
int helpextern = T_HELPART; int helpextern = T_HELPART;
#endif #endif
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment