diff --git a/src/Makefile b/src/Makefile
index f2d532cd5e9b75e3b559ff02747ad5b7652c5d9d..c33e42daad30003c53b223f4d44d8f81fa718312 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -64,6 +64,7 @@
# Compile without 3D sound support, add 'NOHS=1'
# Compile with GDBstubs, add 'RDB=1'
# Compile without PNG, add 'NOPNG=1'
+# Compile without zlib, add 'NOZLIB=1'
#
# Addon for SDL:
# To Cross-Compile, add 'SDL_CONFIG=/usr/*/bin/sdl-config'
@@ -107,6 +108,7 @@ include Makefile.cfg
ifdef DUMMY
NOPNG=1
+NOZLIB=1
NONET=1
NOHW=1
NOHS=1
@@ -269,13 +271,6 @@ LIBS+=$(PNG_LDFLAGS)
CFLAGS+=$(PNG_CFLAGS)
endif
-ZLIB_PKGCONFIG?=zlib
-ZLIB_CFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --cflags)
-ZLIB_LDFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --libs)
-
-LIBS+=$(ZLIB_LDFLAGS)
-CFLAGS+=$(ZLIB_CFLAGS)
-
ifdef HAVE_LIBGME
OPTS+=-DHAVE_LIBGME
@@ -287,6 +282,18 @@ LIBS+=$(LIBGME_LDFLAGS)
CFLAGS+=$(LIBGME_CFLAGS)
endif
+ifndef NOZLIB
+OPTS+=-DHAVE_ZLIB
+ZLIB_PKGCONFIG?=zlib
+ZLIB_CFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --cflags)
+ZLIB_LDFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --libs)
+
+LIBS+=$(ZLIB_LDFLAGS)
+CFLAGS+=$(ZLIB_CFLAGS)
+else
+NOPNG=1
+endif
+
ifdef STATIC
LIBS:=-static $(LIBS)
endif
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 50399dbd6a02be1205b5a794f21170ac60967446..b5756a043cc4e4828048c143d8516c8c070bf820 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -5270,8 +5270,10 @@ static void HWR_AddSprites(sector_t *sec)
approx_dist = P_AproxDistance(viewx-thing->x, viewy-thing->y);
- if (approx_dist <= limit_dist)
- HWR_ProjectSprite(thing);
+ if (approx_dist > limit_dist)
+ continue;
+
+ HWR_ProjectSprite(thing);
}
}
else
@@ -5293,8 +5295,10 @@ static void HWR_AddSprites(sector_t *sec)
approx_dist = P_AproxDistance(viewx-precipthing->x, viewy-precipthing->y);
- if (approx_dist <= limit_dist)
- HWR_ProjectPrecipitationSprite(precipthing);
+ if (approx_dist > limit_dist)
+ continue;
+
+ HWR_ProjectPrecipitationSprite(precipthing);
}
}
else
@@ -5624,6 +5628,16 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
x1 = tr_x + x1 * rightcos;
x2 = tr_x - x2 * rightcos;
+ // okay, we can't return now... this is a hack, but weather isn't networked, so it should be ok
+ if (!(thing->precipflags & PCF_THUNK))
+ {
+ if (thing->precipflags & PCF_RAIN)
+ P_RainThinker(thing);
+ else
+ P_SnowThinker(thing);
+ thing->precipflags |= PCF_THUNK;
+ }
+
//
// store information in a vissprite
//
diff --git a/src/lua_script.c b/src/lua_script.c
index d5736f9e5622c059607618aad87e43a073b61b11..3225e332a8c7d5ef47fb4d1c95bd64d5f35166a1 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -193,25 +193,27 @@ void LUA_LoadLump(UINT16 wad, UINT16 lump)
{
MYFILE f;
char *name;
-
+ size_t len;
f.wad = wad;
f.size = W_LumpLengthPwad(wad, lump);
f.data = Z_Malloc(f.size, PU_LUA, NULL);
W_ReadLumpPwad(wad, lump, f.data);
f.curpos = f.data;
+ len = strlen(wadfiles[wad]->filename); // length of file name
+
if (wadfiles[wad]->type == RET_LUA)
{
- name = malloc(strlen(wadfiles[wad]->filename)+1);
+ name = malloc(len+1);
strcpy(name, wadfiles[wad]->filename);
}
else // If it's not a .lua file, copy the lump name in too.
{
lumpinfo_t *lump_p = &wadfiles[wad]->lumpinfo[lump];
- size_t length = strlen(wadfiles[wad]->filename) + 1 + strlen(lump_p->name2); // length of file name, '|', and lump name
- name = malloc(length + 1);
+ len += 1 + strlen(lump_p->name2); // length of file name, '|', and lump name
+ name = malloc(len+1);
sprintf(name, "%s|%s", wadfiles[wad]->filename, lump_p->name2);
- name[length] = '\0';
+ name[len] = '\0';
}
LUA_LoadFile(&f, name); // actually load file!
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 7c9baf0f11583f4a1ab8aded7eae603b727064ac..3031e89e0b4c0362e2190d47e5152bd1be1a0123 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -4059,7 +4059,8 @@ void P_RecalcPrecipInSector(sector_t *sector)
//
void P_NullPrecipThinker(precipmobj_t *mobj)
{
- (void)mobj;
+ //(void)mobj;
+ mobj->precipflags &= ~PCF_THUNK;
}
void P_SnowThinker(precipmobj_t *mobj)
@@ -4079,25 +4080,26 @@ void P_RainThinker(precipmobj_t *mobj)
{
// cycle through states,
// calling action functions at transitions
- if (mobj->tics > 0 && --mobj->tics == 0)
- {
- // you can cycle through multiple states in a tic
- if (!P_SetPrecipMobjState(mobj, mobj->state->nextstate))
- return; // freed itself
- }
+ if (mobj->tics <= 0)
+ return;
+
+ if (--mobj->tics)
+ return;
+
+ if (!P_SetPrecipMobjState(mobj, mobj->state->nextstate))
+ return;
+
+ if (mobj->state != &states[S_RAINRETURN])
+ return;
+
+ mobj->z = mobj->ceilingz;
+ P_SetPrecipMobjState(mobj, S_RAIN1);
- if (mobj->state == &states[S_RAINRETURN])
- {
- mobj->z = mobj->ceilingz;
- P_SetPrecipMobjState(mobj, S_RAIN1);
- }
return;
}
// adjust height
- mobj->z += mobj->momz;
-
- if (mobj->z <= mobj->floorz)
+ if ((mobj->z += mobj->momz) <= mobj->floorz)
{
// no splashes on sky or bottomless pits
if (mobj->precipflags & PCF_PIT)
@@ -8921,14 +8923,15 @@ static precipmobj_t *P_SpawnPrecipMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype
static inline precipmobj_t *P_SpawnRainMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
{
precipmobj_t *mo = P_SpawnPrecipMobj(x,y,z,type);
- mo->thinker.function.acp1 = (actionf_p1)P_RainThinker;
+ mo->precipflags |= PCF_RAIN;
+ //mo->thinker.function.acp1 = (actionf_p1)P_RainThinker;
return mo;
}
static inline precipmobj_t *P_SpawnSnowMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
{
precipmobj_t *mo = P_SpawnPrecipMobj(x,y,z,type);
- mo->thinker.function.acp1 = (actionf_p1)P_SnowThinker;
+ //mo->thinker.function.acp1 = (actionf_p1)P_SnowThinker;
return mo;
}
diff --git a/src/p_mobj.h b/src/p_mobj.h
index 630600b547fd4a0aeca8c2095a24a8d79385bd08..5c0408e1bc2a9e5b2a05d45b2985d060d3f4c444 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -254,6 +254,10 @@ typedef enum {
PCF_FOF = 4,
// Above MOVING FOF (this means we need to keep floorz up to date...)
PCF_MOVINGFOF = 8,
+ // Is rain.
+ PCF_RAIN = 16,
+ // Ran the thinker this tic.
+ PCF_THUNK = 32,
} precipflag_t;
// Map Object definition.
typedef struct mobj_s
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 05aaf6f6d65e9f49e7b8a6c6d7d3395bedb0cd08..6a07e513f20d2f20407d6ad24cd0063d7de65b31 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -2121,8 +2121,7 @@ static void P_NetArchiveThinkers(void)
for (th = thinkercap.next; th != &thinkercap; th = th->next)
{
if (!(th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed
- || th->function.acp1 == (actionf_p1)P_RainThinker
- || th->function.acp1 == (actionf_p1)P_SnowThinker))
+ || th->function.acp1 == (actionf_p1)P_NullPrecipThinker))
numsaved++;
if (th->function.acp1 == (actionf_p1)P_MobjThinker)
@@ -2131,8 +2130,7 @@ static void P_NetArchiveThinkers(void)
continue;
}
#ifdef PARANOIA
- else if (th->function.acp1 == (actionf_p1)P_RainThinker
- || th->function.acp1 == (actionf_p1)P_SnowThinker);
+ else if (th->function.acp1 == (actionf_p1)P_NullPrecipThinker);
#endif
else if (th->function.acp1 == (actionf_p1)T_MoveCeiling)
{
diff --git a/src/p_spec.c b/src/p_spec.c
index 2f65581751500986dca6362b090ec5aeea670a77..9f9e80eccf5507afd69871215342b1a949135324 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -2226,8 +2226,7 @@ void P_SwitchWeather(INT32 weathernum)
for (think = thinkercap.next; think != &thinkercap; think = think->next)
{
- if ((think->function.acp1 != (actionf_p1)P_SnowThinker)
- && (think->function.acp1 != (actionf_p1)P_RainThinker))
+ if (think->function.acp1 != (actionf_p1)P_NullPrecipThinker)
continue; // not a precipmobj thinker
precipmobj = (precipmobj_t *)think;
@@ -2243,14 +2242,12 @@ void P_SwitchWeather(INT32 weathernum)
for (think = thinkercap.next; think != &thinkercap; think = think->next)
{
+ if (think->function.acp1 != (actionf_p1)P_NullPrecipThinker)
+ continue; // not a precipmobj thinker
+ precipmobj = (precipmobj_t *)think;
+
if (swap == PRECIP_RAIN) // Snow To Rain
{
- if (!(think->function.acp1 == (actionf_p1)P_SnowThinker
- || think->function.acp1 == (actionf_p1)P_NullPrecipThinker))
- continue; // not a precipmobj thinker
-
- precipmobj = (precipmobj_t *)think;
-
precipmobj->flags = mobjinfo[MT_RAIN].flags;
st = &states[mobjinfo[MT_RAIN].spawnstate];
precipmobj->state = st;
@@ -2261,18 +2258,13 @@ void P_SwitchWeather(INT32 weathernum)
precipmobj->precipflags &= ~PCF_INVISIBLE;
- think->function.acp1 = (actionf_p1)P_RainThinker;
+ precipmobj->precipflags |= PCF_RAIN;
+ //think->function.acp1 = (actionf_p1)P_RainThinker;
}
else if (swap == PRECIP_SNOW) // Rain To Snow
{
INT32 z;
- if (!(think->function.acp1 == (actionf_p1)P_RainThinker
- || think->function.acp1 == (actionf_p1)P_NullPrecipThinker))
- continue; // not a precipmobj thinker
-
- precipmobj = (precipmobj_t *)think;
-
precipmobj->flags = mobjinfo[MT_SNOWFLAKE].flags;
z = M_RandomByte();
@@ -2290,19 +2282,13 @@ void P_SwitchWeather(INT32 weathernum)
precipmobj->frame = st->frame;
precipmobj->momz = mobjinfo[MT_SNOWFLAKE].speed;
- precipmobj->precipflags &= ~PCF_INVISIBLE;
+ precipmobj->precipflags &= ~(PCF_INVISIBLE|PCF_RAIN);
- think->function.acp1 = (actionf_p1)P_SnowThinker;
+ //think->function.acp1 = (actionf_p1)P_SnowThinker;
}
else if (swap == PRECIP_BLANK || swap == PRECIP_STORM_NORAIN) // Remove precip, but keep it around for reuse.
{
- if (!(think->function.acp1 == (actionf_p1)P_RainThinker
- || think->function.acp1 == (actionf_p1)P_SnowThinker))
- continue;
-
- precipmobj = (precipmobj_t *)think;
-
- think->function.acp1 = (actionf_p1)P_NullPrecipThinker;
+ //think->function.acp1 = (actionf_p1)P_NullPrecipThinker;
precipmobj->precipflags |= PCF_INVISIBLE;
}
diff --git a/src/p_tick.c b/src/p_tick.c
index a51ce2eb6eb326248e44a5a9120a8bd53c7faf25..eb47e0c3608a7d210c37a6de3e4d1adeb80fbc2e 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -56,12 +56,12 @@ void Command_Numthinkers_f(void)
CONS_Printf(M_GetText("numthinkers <#>: Count number of thinkers\n"));
CONS_Printf(
"\t1: P_MobjThinker\n"
- "\t2: P_RainThinker\n"
- "\t3: P_SnowThinker\n"
- "\t4: P_NullPrecipThinker\n"
- "\t5: T_Friction\n"
- "\t6: T_Pusher\n"
- "\t7: P_RemoveThinkerDelayed\n");
+ /*"\t2: P_RainThinker\n"
+ "\t3: P_SnowThinker\n"*/
+ "\t2: P_NullPrecipThinker\n"
+ "\t3: T_Friction\n"
+ "\t4: T_Pusher\n"
+ "\t5: P_RemoveThinkerDelayed\n");
return;
}
@@ -73,27 +73,27 @@ void Command_Numthinkers_f(void)
action = (actionf_p1)P_MobjThinker;
CONS_Printf(M_GetText("Number of %s: "), "P_MobjThinker");
break;
- case 2:
+ /*case 2:
action = (actionf_p1)P_RainThinker;
CONS_Printf(M_GetText("Number of %s: "), "P_RainThinker");
break;
case 3:
action = (actionf_p1)P_SnowThinker;
CONS_Printf(M_GetText("Number of %s: "), "P_SnowThinker");
- break;
- case 4:
+ break;*/
+ case 2:
action = (actionf_p1)P_NullPrecipThinker;
CONS_Printf(M_GetText("Number of %s: "), "P_NullPrecipThinker");
break;
- case 5:
+ case 3:
action = (actionf_p1)T_Friction;
CONS_Printf(M_GetText("Number of %s: "), "T_Friction");
break;
- case 6:
+ case 4:
action = (actionf_p1)T_Pusher;
CONS_Printf(M_GetText("Number of %s: "), "T_Pusher");
break;
- case 7:
+ case 5:
action = (actionf_p1)P_RemoveThinkerDelayed;
CONS_Printf(M_GetText("Number of %s: "), "P_RemoveThinkerDelayed");
break;
diff --git a/src/p_user.c b/src/p_user.c
index 806fc5da0883856bb881f5da006ed7ab92f939c3..dd2ddbc829477cfa628a912c14625bc7bc4bad4c 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8777,7 +8777,13 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
subsector_t *newsubsec;
fixed_t f1, f2;
- cameranoclip = (player->powers[pw_carry] == CR_NIGHTSMODE || player->pflags & PF_NOCLIP) || (player->mo->flags & (MF_NOCLIP|MF_NOCLIPHEIGHT)); // Noclipping player camera noclips too!!
+ // We probably shouldn't move the camera if there is no player or player mobj somehow
+ if (!player || !player->mo)
+ return true;
+
+ mo = player->mo;
+
+ cameranoclip = (player->powers[pw_carry] == CR_NIGHTSMODE || player->pflags & PF_NOCLIP) || (mo->flags & (MF_NOCLIP|MF_NOCLIPHEIGHT)); // Noclipping player camera noclips too!!
if (!(player->climbing || (player->powers[pw_carry] == CR_NIGHTSMODE) || player->playerstate == PST_DEAD))
{
@@ -8798,7 +8804,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
else if (player == &players[secondarydisplayplayer])
focusangle = localangle2;
else
- focusangle = player->mo->angle;
+ focusangle = mo->angle;
if (thiscam == &camera)
camrotate = cv_cam_rotate.value;
else if (thiscam == &camera2)
@@ -8810,17 +8816,9 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
return true;
}
- if (!player || !player->mo)
- return true;
-
- mo = player->mo;
-
thiscam->radius = FixedMul(20*FRACUNIT, mo->scale);
thiscam->height = FixedMul(16*FRACUNIT, mo->scale);
- if (!mo)
- return true;
-
// Don't run while respawning from a starpost
// Inu 4/8/13 Why not?!
// if (leveltime > 0 && timeinmap <= 0)
@@ -8828,7 +8826,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
if (player->powers[pw_carry] == CR_NIGHTSMODE)
{
- focusangle = player->mo->angle;
+ focusangle = mo->angle;
focusaiming = 0;
}
else if (player == &players[consoleplayer])
@@ -8843,7 +8841,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
}
else
{
- focusangle = player->mo->angle;
+ focusangle = mo->angle;
focusaiming = player->aiming;
}
@@ -8890,12 +8888,12 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
angle = R_PointToAngle2(player->axis1->x, player->axis1->y, player->axis2->x, player->axis2->y);
angle += ANGLE_90;
}
- else if (player->mo->target)
+ else if (mo->target)
{
- if (player->mo->target->flags2 & MF2_AMBUSH)
- angle = R_PointToAngle2(player->mo->target->x, player->mo->target->y, player->mo->x, player->mo->y);
+ if (mo->target->flags2 & MF2_AMBUSH)
+ angle = R_PointToAngle2(mo->target->x, mo->target->y, mo->x, mo->y);
else
- angle = R_PointToAngle2(player->mo->x, player->mo->y, player->mo->target->x, player->mo->target->y);
+ angle = R_PointToAngle2(mo->x, mo->y, mo->target->x, mo->target->y);
}
}
else if (P_AnalogMove(player)) // Analog
@@ -8984,7 +8982,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
if (twodlevel || (mo->flags2 & MF2_TWOD))
{
// Camera doesn't ALWAYS need to move, only when running...
- if (abs(player->mo->momx) > 10)
+ if (abs(mo->momx) > 10)
{
// Move the camera all smooth-like, not jerk it around...
if (mo->momx > 0)
@@ -9302,13 +9300,13 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
vy = thiscam->y;
}
- if (P_AproxDistance(vx - player->mo->x, vy - player->mo->y) < FixedMul(48*FRACUNIT, mo->scale))
- player->mo->flags2 |= MF2_SHADOW;
+ if (P_AproxDistance(vx - mo->x, vy - mo->y) < FixedMul(48*FRACUNIT, mo->scale))
+ mo->flags2 |= MF2_SHADOW;
else
- player->mo->flags2 &= ~MF2_SHADOW;
+ mo->flags2 &= ~MF2_SHADOW;
}
else
- player->mo->flags2 &= ~MF2_SHADOW;
+ mo->flags2 &= ~MF2_SHADOW;
/* if (!resetcalled && (player->powers[pw_carry] == CR_NIGHTSMODE && player->exiting))
{
diff --git a/src/r_things.c b/src/r_things.c
index f4a0fd28c900df5cc5abddbbcf6c312f5425c6fe..a6a7d9877c977b60eb2008126f9d87080fd96cf6 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -1525,6 +1525,17 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
return;
}
+ // okay, we can't return now except for vertical clipping... this is a hack, but weather isn't networked, so it should be ok
+ if (!(thing->precipflags & PCF_THUNK))
+ {
+ if (thing->precipflags & PCF_RAIN)
+ P_RainThinker(thing);
+ else
+ P_SnowThinker(thing);
+ thing->precipflags |= PCF_THUNK;
+ }
+
+
//SoM: 3/17/2000: Disregard sprites that are out of view..
gzt = thing->z + spritecachedinfo[lump].topoffset;
gz = gzt - spritecachedinfo[lump].height;
@@ -1642,8 +1653,10 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel)
approx_dist = P_AproxDistance(viewx-thing->x, viewy-thing->y);
- if (approx_dist <= limit_dist)
- R_ProjectSprite(thing);
+ if (approx_dist > limit_dist)
+ continue;
+
+ R_ProjectSprite(thing);
}
}
else
@@ -1664,8 +1677,10 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel)
approx_dist = P_AproxDistance(viewx-precipthing->x, viewy-precipthing->y);
- if (approx_dist <= limit_dist)
- R_ProjectPrecipitationSprite(precipthing);
+ if (approx_dist > limit_dist)
+ continue;
+
+ R_ProjectPrecipitationSprite(precipthing);
}
}
else
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index c8fcd080ebd42aa5f989c60875e0cd2f4bbe1aec..eb851a619f2f3d2a8f4f67003aa0303c9d785fd8 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -124,6 +124,10 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
#include "macosx/mac_resources.h"
#endif
+#ifndef errno
+#include <errno.h>
+#endif
+
// Locations for searching the srb2.pk3
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2"
@@ -1149,6 +1153,7 @@ static void I_ShutdownJoystick2(void)
D_PostEvent(&event);
}
+ joystick2_started = 0;
JoyReset(&JoyInfo2);
if (!joystick_started && !joystick2_started && SDL_WasInit(SDL_INIT_JOYSTICK) == SDL_INIT_JOYSTICK)
{
@@ -1678,7 +1683,7 @@ static void I_ShutdownMouse2(void)
EscapeCommFunction(mouse2filehandle, CLRRTS);
PurgeComm(mouse2filehandle, PURGE_TXABORT | PURGE_RXABORT |
- PURGE_TXCLEAR | PURGE_RXCLEAR);
+ PURGE_TXCLEAR | PURGE_RXCLEAR);
CloseHandle(mouse2filehandle);
@@ -1871,11 +1876,11 @@ void I_StartupMouse2(void)
{
// COM file handle
mouse2filehandle = CreateFileA(cv_mouse2port.string, GENERIC_READ | GENERIC_WRITE,
- 0, // exclusive access
- NULL, // no security attrs
- OPEN_EXISTING,
- FILE_ATTRIBUTE_NORMAL,
- NULL);
+ 0, // exclusive access
+ NULL, // no security attrs
+ OPEN_EXISTING,
+ FILE_ATTRIBUTE_NORMAL,
+ NULL);
if (mouse2filehandle == INVALID_HANDLE_VALUE)
{
INT32 e = GetLastError();
@@ -1895,7 +1900,7 @@ void I_StartupMouse2(void)
// purge buffers
PurgeComm(mouse2filehandle, PURGE_TXABORT | PURGE_RXABORT
- | PURGE_TXCLEAR | PURGE_RXCLEAR);
+ | PURGE_TXCLEAR | PURGE_RXCLEAR);
// setup port to 1200 7N1
dcb.DCBlength = sizeof (DCB);
@@ -2024,7 +2029,7 @@ static void I_ShutdownTimer(void)
tic_t I_GetTime (void)
{
static Uint32 basetime = 0;
- Uint32 ticks = SDL_GetTicks();
+ Uint32 ticks = SDL_GetTicks();
if (!basetime)
basetime = ticks;
@@ -2090,7 +2095,6 @@ INT32 I_StartupSystem(void)
return 0;
}
-
//
// I_Quit
//
@@ -2369,7 +2373,7 @@ void I_GetDiskFreeSpace(INT64 *freespace)
{
DWORD SectorsPerCluster, BytesPerSector, NumberOfFreeClusters, TotalNumberOfClusters;
GetDiskFreeSpace(NULL, &SectorsPerCluster, &BytesPerSector,
- &NumberOfFreeClusters, &TotalNumberOfClusters);
+ &NumberOfFreeClusters, &TotalNumberOfClusters);
*freespace = BytesPerSector*SectorsPerCluster*NumberOfFreeClusters;
}
#else // Dummy for platform independent; 1GB should be enough
@@ -2576,22 +2580,22 @@ static const char *locateWad(void)
#ifdef CMAKECONFIG
#ifndef NDEBUG
- I_OutputMsg(","CMAKE_ASSETS_DIR);
- strcpy(returnWadPath, CMAKE_ASSETS_DIR);
- if (isWadPathOk(returnWadPath))
- {
- return returnWadPath;
- }
+ I_OutputMsg(","CMAKE_ASSETS_DIR);
+ strcpy(returnWadPath, CMAKE_ASSETS_DIR);
+ if (isWadPathOk(returnWadPath))
+ {
+ return returnWadPath;
+ }
#endif
#endif
#ifdef __APPLE__
- OSX_GetResourcesPath(returnWadPath);
- I_OutputMsg(",%s", returnWadPath);
- if (isWadPathOk(returnWadPath))
- {
- return returnWadPath;
- }
+ OSX_GetResourcesPath(returnWadPath);
+ I_OutputMsg(",%s", returnWadPath);
+ if (isWadPathOk(returnWadPath))
+ {
+ return returnWadPath;
+ }
#endif
// examine default dirs
@@ -2696,7 +2700,30 @@ const char *I_LocateWad(void)
#ifdef __linux__
#define MEMINFO_FILE "/proc/meminfo"
#define MEMTOTAL "MemTotal:"
+#define MEMAVAILABLE "MemAvailable:"
#define MEMFREE "MemFree:"
+#define CACHED "Cached:"
+#define BUFFERS "Buffers:"
+#define SHMEM "Shmem:"
+
+/* Parse the contents of /proc/meminfo (in buf), return value of "name"
+ * (example: MemTotal) */
+static long get_entry(const char* name, const char* buf)
+{
+ long val;
+ char* hit = strstr(buf, name);
+ if (hit == NULL) {
+ return -1;
+ }
+
+ errno = 0;
+ val = strtol(hit + strlen(name), NULL, 10);
+ if (errno != 0) {
+ CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno));
+ return -1;
+ }
+ return val;
+}
#endif
// quick fix for compil
@@ -2758,6 +2785,11 @@ UINT32 I_GetFreeMem(UINT32 *total)
UINT32 totalKBytes;
INT32 n;
INT32 meminfo_fd = -1;
+ long Cached;
+ long MemFree;
+ long Buffers;
+ long Shmem;
+ long MemAvailable = -1;
meminfo_fd = open(MEMINFO_FILE, O_RDONLY);
n = read(meminfo_fd, buf, 1023);
@@ -2783,16 +2815,28 @@ UINT32 I_GetFreeMem(UINT32 *total)
memTag += sizeof (MEMTOTAL);
totalKBytes = atoi(memTag);
- if ((memTag = strstr(buf, MEMFREE)) == NULL)
+ if ((memTag = strstr(buf, MEMAVAILABLE)) == NULL)
{
- // Error
- if (total)
- *total = 0L;
- return 0;
- }
+ Cached = get_entry(CACHED, buf);
+ MemFree = get_entry(MEMFREE, buf);
+ Buffers = get_entry(BUFFERS, buf);
+ Shmem = get_entry(SHMEM, buf);
+ MemAvailable = Cached + MemFree + Buffers - Shmem;
- memTag += sizeof (MEMFREE);
- freeKBytes = atoi(memTag);
+ if (MemAvailable == -1)
+ {
+ // Error
+ if (total)
+ *total = 0L;
+ return 0;
+ }
+ freeKBytes = MemAvailable;
+ }
+ else
+ {
+ memTag += sizeof (MEMAVAILABLE);
+ freeKBytes = atoi(memTag);
+ }
if (total)
*total = totalKBytes << 10;
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 5211efe0af4c18d1c2daf43471eadd67962bf59a..cfdb32303e9c8e415ba2b523ae9280cb565eda77 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -38,10 +38,8 @@
#include "gme/gme.h"
#define GME_TREBLE 5.0
#define GME_BASS 1.0
-#ifdef HAVE_PNG /// TODO: compile with zlib support without libpng
-
-#define HAVE_ZLIB
+#ifdef HAVE_ZLIB
#ifndef _MSC_VER
#ifndef _LARGEFILE64_SOURCE
#define _LARGEFILE64_SOURCE
@@ -57,8 +55,8 @@
#endif
#include "zlib.h"
-#endif
-#endif
+#endif // HAVE_ZLIB
+#endif // HAVE_LIBGME
UINT8 sound_started = false;
@@ -178,7 +176,7 @@ static Mix_Chunk *ds2chunk(void *stream)
return NULL; // would and/or did wrap, can't store.
break;
}
- sound = malloc(newsamples<<2); // samples * frequency shift * bytes per sample * channels
+ sound = Z_Malloc(newsamples<<2, PU_SOUND, NULL); // samples * frequency shift * bytes per sample * channels
s = (SINT8 *)stream;
d = (INT16 *)sound;
@@ -246,6 +244,7 @@ void *I_GetSfx(sfxinfo_t *sfx)
{
void *lump;
Mix_Chunk *chunk;
+ SDL_RWops *rw;
#ifdef HAVE_LIBGME
Music_Emu *emu;
gme_info_t *info;
@@ -361,7 +360,7 @@ void *I_GetSfx(sfxinfo_t *sfx)
}
Z_Free(inflatedData); // GME didn't open jack, but don't let that stop us from freeing this up
#else
- //CONS_Alert(CONS_ERROR,"Cannot decompress VGZ; no zlib support\n");
+ return NULL; // No zlib support
#endif
}
// Try to read it as a GME sound
@@ -387,13 +386,35 @@ void *I_GetSfx(sfxinfo_t *sfx)
#endif
// Try to load it as a WAVE or OGG using Mixer.
- return Mix_LoadWAV_RW(SDL_RWFromMem(lump, sfx->length), 1);
+ rw = SDL_RWFromMem(lump, sfx->length);
+ if (rw != NULL)
+ {
+ chunk = Mix_LoadWAV_RW(rw, 1);
+ return chunk;
+ }
+
+ return NULL; // haven't been able to get anything
}
void I_FreeSfx(sfxinfo_t *sfx)
{
if (sfx->data)
+ {
+ Mix_Chunk *chunk = (Mix_Chunk*)sfx->data;
+ UINT8 *abufdata = NULL;
+ if (chunk->allocated == 0)
+ {
+ // We allocated the data in this chunk, so get the abuf from mixer, then let it free the chunk, THEN we free the data
+ // I believe this should ensure the sound is not playing when we free it
+ abufdata = chunk->abuf;
+ }
Mix_FreeChunk(sfx->data);
+ if (abufdata)
+ {
+ // I'm going to assume we used Z_Malloc to allocate this data.
+ Z_Free(abufdata);
+ }
+ }
sfx->data = NULL;
sfx->lumpnum = LUMPERROR;
}
@@ -524,6 +545,7 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
char *data;
size_t len;
lumpnum_t lumpnum = W_CheckNumForName(va("O_%s",musicname));
+ SDL_RWops *rw;
I_Assert(!music);
#ifdef HAVE_LIBGME
@@ -621,7 +643,8 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
}
Z_Free(inflatedData); // GME didn't open jack, but don't let that stop us from freeing this up
#else
- //CONS_Alert(CONS_ERROR,"Cannot decompress VGZ; no zlib support\n");
+ CONS_Alert(CONS_ERROR,"Cannot decompress VGZ; no zlib support\n");
+ return true;
#endif
}
else if (!gme_open_data(data, len, &gme, 44100))
@@ -635,7 +658,11 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
}
#endif
- music = Mix_LoadMUS_RW(SDL_RWFromMem(data, len), SDL_FALSE);
+ rw = SDL_RWFromMem(data, len);
+ if (rw != NULL)
+ {
+ music = Mix_LoadMUS_RW(rw, 1);
+ }
if (!music)
{
CONS_Alert(CONS_ERROR, "Mix_LoadMUS_RW: %s\n", Mix_GetError());
@@ -798,7 +825,11 @@ void I_SetMIDIMusicVolume(UINT8 volume)
INT32 I_RegisterSong(void *data, size_t len)
{
- music = Mix_LoadMUS_RW(SDL_RWFromMem(data, len), SDL_FALSE);
+ SDL_RWops *rw = SDL_RWFromMem(data, len);
+ if (rw != NULL)
+ {
+ music = Mix_LoadMUS_RW(rw, 1);
+ }
if (!music)
{
CONS_Alert(CONS_ERROR, "Mix_LoadMUS_RW: %s\n", Mix_GetError());
@@ -842,4 +873,4 @@ void I_UnRegisterSong(INT32 handle)
music = NULL;
}
-#endif
+#endif
\ No newline at end of file
diff --git a/src/v_video.c b/src/v_video.c
index 765965ffdc83f5bc3845d6a875a8184bca8ea348..2f84d4c7e6339e9d28f3a0f564d00c6e3f80416d 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -1045,7 +1045,7 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
//
void V_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT8 skincolor)
{
- if (skins[skinnum].flags & SF_HIRES)
+ if (skinnum < 0 || skinnum >= numskins || (skins[skinnum].flags & SF_HIRES))
V_DrawScaledPatch(x - 10, y - 14, flags, W_CachePatchName("CONTINS", PU_CACHE));
else
{
diff --git a/src/w_wad.c b/src/w_wad.c
index 7babd22ef41cadf2e35aa0e72d4e8eecd38c5e15..3112e02a0f182e4cebc67122790163812267bbaf 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -234,10 +234,10 @@ static inline void W_LoadDehackedLumps(UINT16 wadnum)
for (lump = 0; lump < wadfiles[wadnum]->numlumps; lump++, lump_p++)
if (memcmp(lump_p->name,"SOC_",4)==0) // Check for generic SOC lump
{ // shameless copy+paste of code from LUA_LoadLump
- size_t length = strlen(wadfiles[wadnum]->filename) + 1 + strlen(lump_p->name2); // length of file name, '|', and lump name
- char *name = malloc(length + 1);
+ size_t len = strlen(wadfiles[wadnum]->filename) + 1 + strlen(lump_p->name2); // length of file name, '|', and lump name
+ char *name = malloc(len+1);
sprintf(name, "%s|%s", wadfiles[wadnum]->filename, lump_p->name2);
- name[length] = '\0';
+ name[len] = '\0';
CONS_Printf(M_GetText("Loading SOC from %s\n"), name);
DEH_LoadDehackedLumpPwad(wadnum, lump);
diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c
index 88f34abf8a86ef2d2f1c009e8ddceb8cc47d1f2f..58644457a0b909df3b700e181ef8a4fadff3d111 100644
--- a/src/win32/win_snd.c
+++ b/src/win32/win_snd.c
@@ -17,10 +17,8 @@
#include "gme/gme.h"
#define GME_TREBLE 5.0
#define GME_BASS 1.0
-#ifdef HAVE_PNG /// TODO: compile with zlib support without libpng
-
-#define HAVE_ZLIB
+#ifdef HAVE_ZLIB
#ifndef _MSC_VER
#ifndef _LARGEFILE64_SOURCE
#define _LARGEFILE64_SOURCE
@@ -36,8 +34,8 @@
#endif
#include "zlib.h"
-#endif
-#endif
+#endif // HAVE_ZLIB
+#endif // HAVE_LIBGME
static FMOD_SYSTEM *fsys;
static FMOD_SOUND *music_stream;