zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Beauty tweaks; revert s_buildDate since we don't want windows builds to pull

Browse source 
snapshots in the current development state now.

git-svn-id: https://svn.eduke32.com/eduke32@2205 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-12-25 15:33:24 +00:00
parent 664e0dcb9b
commit 9f2153d0ea
3 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/eduke32/build/src/engine.c
View file

@ -9483,8 +9483,8 @@ int32_t loadoldboard(char *filename, char fromwhere, int32_t *daposx, int32_t *d
kclose(fil);
#ifdef USE_OPENGL
memset(spriteext, 0, sizeof(spriteext_t) * MAXSPRITES);
memset(spritesmooth, 0, sizeof(spritesmooth_t) *(MAXSPRITES+MAXUNIQHUDID));
Bmemset(spriteext, 0, sizeof(spriteext_t) * MAXSPRITES);
Bmemset(spritesmooth, 0, sizeof(spritesmooth_t) * (MAXSPRITES+MAXUNIQHUDID));
#endif
guniqhudid = 0;
@ -9568,8 +9568,8 @@ int32_t loadmaphack(const char *filename)
if (filename)
{
memset(spriteext, 0, sizeof(spriteext_t) * MAXSPRITES);
memset(spritesmooth, 0, sizeof(spritesmooth_t) *(MAXSPRITES+MAXUNIQHUDID));
Bmemset(spriteext, 0, sizeof(spriteext_t) * MAXSPRITES);
Bmemset(spritesmooth, 0, sizeof(spritesmooth_t) *(MAXSPRITES+MAXUNIQHUDID));
Bstrcpy(fn, filename);
script = scriptfile_fromfile(filename);
}

24
polymer/eduke32/source/game.c
View file

@ -3765,7 +3765,7 @@ int32_t A_InsertSprite(int32_t whatsect,int32_t s_x,int32_t s_y,int32_t s_z,int3
Bmemset(&actor[i], 0, sizeof(actor_t));
Bmemcpy(&actor[i].bposx, s, sizeof(vec3_t)); // update bposx/y/z
if (s_ow > -1 && s_ow < MAXSPRITES)
if ((unsigned)s_ow < MAXSPRITES)
{
actor[i].picnum = sprite[s_ow].picnum;
actor[i].floorz = actor[s_ow].floorz;
@ -3788,8 +3788,8 @@ int32_t A_InsertSprite(int32_t whatsect,int32_t s_x,int32_t s_y,int32_t s_z,int3
if (show2dsector[SECT>>3]&(1<<(SECT&7))) show2dsprite[i>>3] |= (1<<(i&7));
else show2dsprite[i>>3] &= ~(1<<(i&7));
clearbufbyte(&spriteext[i], sizeof(spriteext_t), 0);
clearbufbyte(&spritesmooth[i], sizeof(spritesmooth_t), 0);
Bmemset(&spriteext[i], 0, sizeof(spriteext_t));
Bmemset(&spritesmooth[i], 0, sizeof(spritesmooth_t));
A_ResetVars(i);
@ -6175,16 +6175,6 @@ void G_DoSpriteAnimations(int32_t x,int32_t y,int32_t a,int32_t smoothratio)
if (g_player[p].ps->over_shoulder_on > 0 && g_player[p].ps->newowner < 0)
{
/*
if (screenpeek == myconnectindex && numplayers >= 2)
{
t->x = omy.x+mulscale16((int32_t)(my.x-omy.x),smoothratio);
t->y = omy.y+mulscale16((int32_t)(my.y-omy.y),smoothratio);
t->z = omy.z+mulscale16((int32_t)(my.z-omy.z),smoothratio)+PHEIGHT;
t->ang = omyang+mulscale16((int32_t)(((myang+1024-omyang)&2047)-1024),smoothratio);
t->sectnum = mycursectnum;
}
else*/
t->ang = g_player[p].ps->ang+mulscale16((int32_t)(((g_player[p].ps->ang+1024- g_player[p].ps->oang)&2047)-1024),smoothratio);
#ifdef USE_OPENGL
if (bpp > 8 && usemodels && md_tilehasmodel(t->picnum, t->pal) >= 0)
@ -7892,9 +7882,9 @@ FAKE_F3:
if (BUTTON(gamefunc_Shrink_Screen))
g_player[myconnectindex].ps->zoom -= mulscale6(j,max(g_player[myconnectindex].ps->zoom,256));
if ((g_player[myconnectindex].ps->zoom > 2048))
if (g_player[myconnectindex].ps->zoom > 2048)
g_player[myconnectindex].ps->zoom = 2048;
if ((g_player[myconnectindex].ps->zoom < 48))
if (g_player[myconnectindex].ps->zoom < 48)
g_player[myconnectindex].ps->zoom = 48;
}
@ -9377,7 +9367,7 @@ static void G_Startup(void)
G_InitDynamicTiles();
if ((g_netServer || ud.multimode > 1)) G_CheckGametype();
if (g_netServer || ud.multimode > 1) G_CheckGametype();
if (g_noSound) ud.config.SoundToggle = 0;
if (g_noMusic) ud.config.MusicToggle = 0;
@ -10156,7 +10146,7 @@ CLEAN_DIRECTORY:
// getnames();
if ((g_netServer || ud.multimode > 1))
if (g_netServer || ud.multimode > 1)
{
if (ud.warp_on == 0)
{

2
polymer/eduke32/source/global.c
View file

@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "duke3d.h"
#include "rev.h"
const char *s_buildDate = "20111222";
const char *s_buildDate = "20110319";
char *MusicPtr = NULL;
int32_t g_musicSize;