diff --git a/polymer/build/src/engine.c b/polymer/build/src/engine.c index 99fbfad65..2b1461150 100644 --- a/polymer/build/src/engine.c +++ b/polymer/build/src/engine.c @@ -7446,7 +7446,7 @@ void loadtile(short tilenume) kread(artfil,ptr,dasiz); faketimerhandler(); artfilplc = tilefileoffs[tilenume]+dasiz; - } else Bmemset((char *)waloff[tilenume],1,dasiz); + } else Bmemset((char *)waloff[tilenume],0,dasiz); } diff --git a/polymer/build/src/sdlayer.c b/polymer/build/src/sdlayer.c index 7d619628a..b78a92bc7 100644 --- a/polymer/build/src/sdlayer.c +++ b/polymer/build/src/sdlayer.c @@ -39,6 +39,10 @@ int startwin_settitle(const char *s) { s=s; return 0; } // undefine to restrict windowed resolutions to conventional sizes #define ANY_WINDOWED_SIZE +// fix for mousewheel +#define MWHEELTICKS 10 +static unsigned long mwheelup, mwheeldown; + int _buildargc = 1; char **_buildargv = NULL; extern long app_main(long argc, char *argv[]); @@ -1299,14 +1303,22 @@ int handleevents(void) case SDL_BUTTON_LEFT: j = 0; break; case SDL_BUTTON_RIGHT: j = 1; break; case SDL_BUTTON_MIDDLE: j = 2; break; - default: j = -1; break; + default: j = ev.button.button; break; } if (j<0) break; - if (ev.button.state == SDL_PRESSED) + if (ev.button.state == SDL_PRESSED) { + if (ev.button.button == SDL_BUTTON_WHEELUP) { + mwheelup = totalclock; + } + if (ev.button.button == SDL_BUTTON_WHEELDOWN) { + mwheeldown = totalclock; + } mouseb |= (1<ltextptr; @@ -7712,17 +7718,6 @@ static int parse_rancid_net(scriptfile *script) break; } } - return 0; -} - -int load_rancid_net(char *fn) -{ - scriptfile *script; - - script = scriptfile_fromfile(fn); - if (!script) return -1; - - parse_rancid_net(script); scriptfile_close(script); scriptfile_clearsymbols(); @@ -7997,12 +7992,7 @@ void checkcommandline(int argc,char **argv) { Bstrcpy(confilename,c); userconfiles = 1; - /* if(SafeFileExists(c) == 0) - { - initprintf("Could not find CON file '%s'.\n",confilename ); - exit(-1); - } - else */ initprintf("Using CON file: '%s'\n",confilename); + initprintf("Using CON file: '%s'\n",confilename); } break; case 'g': diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index 371654714..710525780 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -2601,7 +2601,7 @@ char parsecommand(void) { if(keyword() >= 0) { - scriptptr += (4-j); + for (i=4-j; i; i--) *(scriptptr++) = 0; break; } switch(j) diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c index 0f1590704..8b7e50384 100644 --- a/polymer/eduke32/source/gameexec.c +++ b/polymer/eduke32/source/gameexec.c @@ -3928,7 +3928,7 @@ SKIPJIBS: case CON_DEBUG: insptr++; - printf("%ld\n",*insptr++); + initprintf("%ld\n",*insptr++); break; case CON_ENDOFGAME: