diff --git a/polymer/eduke32/build/include/build.h b/polymer/eduke32/build/include/build.h index 27e34b228..316b7c525 100644 --- a/polymer/eduke32/build/include/build.h +++ b/polymer/eduke32/build/include/build.h @@ -364,7 +364,6 @@ EXTERN char show2dsprite[(MAXSPRITES+7)>>3]; EXTERN char gotpic[(MAXTILES+7)>>3]; EXTERN char gotsector[(MAXSECTORS+7)>>3]; -EXTERN char captureformat; EXTERN char editorcolors[256]; EXTERN int32_t faketilesiz[MAXTILES]; @@ -373,7 +372,6 @@ EXTERN char *faketiledata[MAXTILES]; EXTERN char spritecol2d[MAXTILES][2]; extern char vgapal16[4*256]; -extern char vgapalette[5*256]; extern uint32_t drawlinepat; extern void faketimerhandler(void); @@ -542,7 +540,7 @@ int32_t loadpics(const char *filename, int32_t askedsize); void loadtile(int16_t tilenume); int32_t qloadkvx(int32_t voxindex, const char *filename); int32_t allocatepermanenttile(int16_t tilenume, int32_t xsiz, int32_t ysiz); -void copytilepiece(int32_t tilenume1, int32_t sx1, int32_t sy1, int32_t xsiz, int32_t ysiz, int32_t tilenume2, int32_t sx2, int32_t sy2); +//void copytilepiece(int32_t tilenume1, int32_t sx1, int32_t sy1, int32_t xsiz, int32_t ysiz, int32_t tilenume2, int32_t sx2, int32_t sy2); void makepalookup(int32_t palnum, char *remapbuf, int8_t r, int8_t g, int8_t b, char dastat); //void setvgapalette(void); void setbasepaltable(uint8_t **basepaltable, uint8_t basepalcount); diff --git a/polymer/eduke32/build/include/mdsprite.h b/polymer/eduke32/build/include/mdsprite.h index b8aa4294c..0a80df549 100644 --- a/polymer/eduke32/build/include/mdsprite.h +++ b/polymer/eduke32/build/include/mdsprite.h @@ -216,7 +216,7 @@ typedef struct { float xadd, yadd, zadd; int16_t angadd, flags, fov; } hudtyp; EXTERN hudtyp hudmem[2][MAXTILES]; EXTERN int32_t mdpause; -EXTERN int32_t nummodelsalloced, nextmodelid; +EXTERN int32_t nextmodelid; EXTERN voxmodel_t *voxmodels[MAXVOXELS]; void voxfree(voxmodel_t *m); diff --git a/polymer/eduke32/build/src/baselayer.c b/polymer/eduke32/build/src/baselayer.c index 778846451..d189b7b7f 100644 --- a/polymer/eduke32/build/src/baselayer.c +++ b/polymer/eduke32/build/src/baselayer.c @@ -304,23 +304,6 @@ static int32_t osdcmd_cvar_set_baselayer(const osdfuncparm_t *parm) if (r != OSDCMD_OK) return r; - /* - if (!Bstrcasecmp(parm->name, "r_scrcaptureformat")) - { - const char *fmts[] = {"TGA", "PCX"}; - if (showval) { OSD_Printf("r_scrcaptureformat is %s\n", fmts[captureformat]); } - else - { - int32_t j; - for (j=0; j<2; j++) - if (!Bstrcasecmp(parm->parms[0], fmts[j])) break; - if (j == 2) return OSDCMD_SHOWHELP; - captureformat = j; - } - return OSDCMD_OK; - } - else */ - if (!Bstrcasecmp(parm->name, "vid_gamma") || !Bstrcasecmp(parm->name, "vid_brightness") || !Bstrcasecmp(parm->name, "vid_contrast")) { setbrightness(GAMMA_CALC,0,0); @@ -341,7 +324,6 @@ int32_t baselayer_init(void) { "r_screenaspect","r_screenaspect: if using the new aspect code and in fullscreen, screen aspect ratio in the form XXYY, e.g. 1609 for 16:9",(void *) &r_screenxy, CVAR_UINT, 100, 9999 }, { "r_novoxmips","r_novoxmips: turn off/on the use of mipmaps when rendering 8-bit voxels",(void *) &novoxmips, CVAR_BOOL, 0, 1 }, { "r_voxels","r_voxels: enable/disable automatic sprite->voxel rendering",(void *) &usevoxels, CVAR_BOOL, 0, 1 }, - /* { "r_scrcaptureformat","r_scrcaptureformat: sets the output format for screenshots (TGA or PCX)",osdcmd_vars, CVAR_FUNCPTR, 0, 0 },*/ #ifdef YAX_ENABLE { "r_tror_nomaskpass", "r_tror_nomaskpass: enable/disable additional pass in TROR software rendering", (void *)&r_tror_nomaskpass, CVAR_BOOL, 0, 1 }, #endif diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c index 57c65b930..d1b60db43 100644 --- a/polymer/eduke32/build/src/build.c +++ b/polymer/eduke32/build/src/build.c @@ -307,8 +307,8 @@ int32_t m32_numdebuglines=0; static void M32_drawdebug(void) { - int i; - int x=4, y=8; + int32_t i; + int32_t x=4, y=8; #if 0 { diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index a88f2cf4a..ce3812aac 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -7821,7 +7821,7 @@ int32_t initengine(void) searchit = 0; searchstat = -1; - for (i=0; i= 0 && tile < MAXTILES + UNREFERENCED_PARAMETER(model); - if (curextra==MAXTILES+EXTRATILES-2)return curextra; - if (tile2model[tile].modelid==-1) {tile2model[tile].pal=pallet; return tile;} - if (tile2model[tile].pal==pallet)return tile; + if (curextra==MAXTILES+EXTRATILES-1) + return curextra; + + if (tile2model[tile].modelid==-1) + { + tile2model[tile].pal=pallet; + return tile; + } + + if (tile2model[tile].pal==pallet) + return tile; + while (tile2model[tile].next!=-1) { tile=tile2model[tile].next; - if (tile2model[tile].pal==pallet)return tile; + if (tile2model[tile].pal==pallet) + return tile; } + tile2model[tile].next=curextra; tile2model[curextra].pal=pallet; + return curextra++; } int32_t Ptile2tile(int32_t tile,int32_t pallet) @@ -63,7 +77,8 @@ int32_t mdinited=0; int32_t mdpause=0; #define MODELALLOCGROUP 256 -int32_t nummodelsalloced = 0, nextmodelid = 0; +static int32_t nummodelsalloced = 0; +int32_t nextmodelid = 0; static int32_t maxmodelverts = 0, allocmodelverts = 0; static int32_t maxmodeltris = 0, allocmodeltris = 0; diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 96a97dbac..4bb67899b 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -1947,7 +1947,7 @@ void fadepal(int32_t r, int32_t g, int32_t b, int32_t start, int32_t end, int32_ } } -void fadepaltile(int32_t r, int32_t g, int32_t b, int32_t start, int32_t end, int32_t step, int32_t tile) +static void fadepaltile(int32_t r, int32_t g, int32_t b, int32_t start, int32_t end, int32_t step, int32_t tile) { if (step > 0) { @@ -3171,9 +3171,9 @@ static int32_t ror_sprite = -1; extern float r_ambientlight; char ror_protectedsectors[MAXSECTORS]; -int32_t drawing_ror = 0; +static int32_t drawing_ror = 0; -void G_SE40(int32_t smoothratio) +static void G_SE40(int32_t smoothratio) { if (ror_sprite != -1) { @@ -6802,7 +6802,7 @@ enum cheatindex_t CHEAT_COMEGETSOME, }; -void G_CheatGetInv(void) +static void G_CheatGetInv(void) { Gv_SetVar(g_iReturnVarID, 400, g_player[myconnectindex].ps->i, myconnectindex); VM_OnEvent(EVENT_CHEATGETSTEROIDS, g_player[myconnectindex].ps->i, myconnectindex, -1); @@ -6869,7 +6869,7 @@ void G_CheatGetInv(void) } } -int8_t cheatbuf[MAXCHEATLEN],cheatbuflen; +static int8_t cheatbuf[MAXCHEATLEN], cheatbuflen; GAME_STATIC void G_DoCheats(void) { @@ -9702,7 +9702,7 @@ void G_BackToMenu(void) wm_setapptitle(tempbuf); } -int32_t G_EndOfLevel(void) +static int32_t G_EndOfLevel(void) { P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0); P_UpdateScreenPal(g_player[myconnectindex].ps); diff --git a/polymer/eduke32/source/game.h b/polymer/eduke32/source/game.h index 85535e801..8151b9f99 100644 --- a/polymer/eduke32/source/game.h +++ b/polymer/eduke32/source/game.h @@ -202,7 +202,7 @@ extern int32_t althud_numberpal; extern int32_t althud_numbertile; extern int32_t althud_shadows; extern int32_t cacnum; -extern int32_t drawing_ror; +//extern int32_t drawing_ror; extern int32_t g_Shareware; extern int32_t g_cameraClock; extern int32_t g_cameraDistance; @@ -228,7 +228,7 @@ extern int32_t ticrandomseed; extern int32_t vote_map; extern int32_t voting; -extern int8_t cheatbuf[MAXCHEATLEN],cheatbuflen; +//extern int8_t cheatbuf[MAXCHEATLEN],cheatbuflen; extern palette_t CrosshairColors; extern palette_t DefaultCrosshairColors; @@ -246,7 +246,7 @@ int32_t A_CheckInventorySprite(spritetype *s); int32_t A_InsertSprite(int32_t whatsect,int32_t s_x,int32_t s_y,int32_t s_z,int32_t s_pn,int32_t s_s,int32_t s_xr,int32_t s_yr,int32_t s_a,int32_t s_ve,int32_t s_zv,int32_t s_ow,int32_t s_ss); int32_t A_Spawn(int32_t j,int32_t pn); int32_t G_DoMoveThings(void); -int32_t G_EndOfLevel(void); +//int32_t G_EndOfLevel(void); int32_t G_GameTextLen(int32_t x,const char *t); int32_t G_PrintGameText(int32_t f,int32_t tile,int32_t x,int32_t y,const char *t,int32_t s,int32_t p,int32_t o,int32_t x1,int32_t y1,int32_t x2,int32_t y2,int32_t z); int32_t GetTime(void); @@ -270,7 +270,7 @@ void A_SpawnWallGlass(int32_t i,int32_t wallnum,int32_t n); void G_AddUserQuote(const char *daquote); void G_BackToMenu(void); void G_BonusScreen(int32_t bonusonly); -void G_CheatGetInv(void); +//void G_CheatGetInv(void); void G_DisplayRest(int32_t smoothratio); void G_DoSpriteAnimations(int32_t x,int32_t y,int32_t a,int32_t smoothratio); void G_DrawBackground(void); @@ -289,7 +289,7 @@ void G_GetCrosshairColor(void); void G_HandleLocalKeys(void); void G_HandleSpecialKeys(void); void G_PrintGameQuotes(void); -void G_SE40(int32_t smoothratio); +//void G_SE40(int32_t smoothratio); #ifdef YAX_ENABLE void G_AnalyzeSprites(void); #endif @@ -303,8 +303,7 @@ void P_SetGamePalette(DukePlayer_t *player,uint8_t palid,int32_t set); int32_t app_main(int32_t argc,const char **argv); void computergetinput(int32_t snum,input_t *syn); void fadepal(int32_t r,int32_t g,int32_t b,int32_t start,int32_t end,int32_t step); -void fadepaltile(int32_t r,int32_t g,int32_t b,int32_t start,int32_t end,int32_t step,int32_t tile); -void sendscore(const char *s); +//void fadepaltile(int32_t r,int32_t g,int32_t b,int32_t start,int32_t end,int32_t step,int32_t tile); static inline int32_t G_GetTeamPalette(int32_t team) { diff --git a/polymer/eduke32/source/m32def.c b/polymer/eduke32/source/m32def.c index 9b7714620..50756a56f 100644 --- a/polymer/eduke32/source/m32def.c +++ b/polymer/eduke32/source/m32def.c @@ -1918,7 +1918,7 @@ static int32_t C_ParseCommand(void) if (nsize == osize) { - int ii, equal=2, linedif = 0, ow, nw; + int32_t ii, equal=2, linedif = 0, ow, nw; for (ii=0; ii