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

git-svn-id: https://svn.eduke32.com/eduke32@1080 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-09-28 11:00:59 +00:00
parent 2c172dcfb7
commit ca8f8d21ae
8 changed files with 138 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
polymer/eduke32/source/anim.c
View file

@ -209,6 +209,7 @@ void playanm(const char *fn,char t)
int ogltexfiltermode=gltexfiltermode; int ogltexfiltermode=gltexfiltermode;
#endif #endif
int32 handle=-1; int32 handle=-1;
int frametime = 0;
// return; // return;
@ -258,8 +259,16 @@ void playanm(const char *fn,char t)
ototalclock = totalclock + 10; ototalclock = totalclock + 10;
frametime = totalclock;
for (i=1;i<numframes;i++) for (i=1;i<numframes;i++)
{ {
if (totalclock > frametime + 45)
{
OSD_Printf("WARNING: slowdown in %s, skipping playback\n",fn);
goto ENDOFANIMLOOP;
}
frametime = totalclock;
while (totalclock < ototalclock) while (totalclock < ototalclock)
{ {
if (KB_KeyWaiting() || MOUSE_GetButtons()&LEFT_MOUSE) if (KB_KeyWaiting() || MOUSE_GetButtons()&LEFT_MOUSE)

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

@ -43,7 +43,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <windows.h> #include <windows.h>
#endif #endif
#define BUILDDATE " 20080924" #define BUILDDATE " 20080928"
#define VERSION " 1.2.0devel" #define VERSION " 1.2.0devel"
static int floor_over_floor; static int floor_over_floor;

2
polymer/eduke32/source/duke3d.h
View file

@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define APPNAME "EDuke32" #define APPNAME "EDuke32"
#define VERSION " 1.5.0devel" #define VERSION " 1.5.0devel"
// this is checked against http://eduke32.com/VERSION // this is checked against http://eduke32.com/VERSION
#define BUILDDATE " 20080924" #define BUILDDATE " 20080928"
#define HEAD2 APPNAME VERSION BUILDDATE #define HEAD2 APPNAME VERSION BUILDDATE
#ifdef __cplusplus #ifdef __cplusplus

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

@ -13027,7 +13027,6 @@ FRAGBONUS:
} }
if (playerbest > 0) for (ii=playerbest/(26*60), ij=1; ii>9; ii/=10, ij++) ; if (playerbest > 0) for (ii=playerbest/(26*60), ij=1; ii>9; ii/=10, ij++) ;
clockpad = max(clockpad,ij); clockpad = max(clockpad,ij);
clockpad += 2;
} }
while (1) while (1)
@ -13139,7 +13138,7 @@ FRAGBONUS:
); );
gametext((320>>2)+71,yy+9,tempbuf,0,2+8+16); gametext((320>>2)+71,yy+9,tempbuf,0,2+8+16);
if (g_player[myconnectindex].ps->player_par < playerbest) if (g_player[myconnectindex].ps->player_par < playerbest)
gametext((320>>2)+71+(clockpad*24),yy+9,"New record!",0,2+8+16); gametext((320>>2)+89+(clockpad*24),yy+9,"New record!",0,2+8+16);
yy+=10; yy+=10;
if (!(ud.volume_number == 0 && ud.last_level-1 == 7)) if (!(ud.volume_number == 0 && ud.last_level-1 == 7))

65
polymer/eduke32/source/gamedef.c
View file

@ -5605,6 +5605,9 @@ static void InitProjectiles(void)
Bmemcpy(&defaultprojectile, &projectile, sizeof(projectile)); Bmemcpy(&defaultprojectile, &projectile, sizeof(projectile));
} }
extern int g_NumObituaries;
extern int g_NumSelfObituaries;
void loadefs(const char *filenam) void loadefs(const char *filenam)
{ {
char *mptr; char *mptr;
@ -5813,6 +5816,7 @@ void loadefs(const char *filenam)
} }
{ {
/*
const char *ppdeathstrings[] = const char *ppdeathstrings[] =
{ {
"^2%s ^2was kicked to the curb by %s", "^2%s ^2was kicked to the curb by %s",
@ -5856,8 +5860,62 @@ void loadefs(const char *filenam)
"^2%s ^2got fragged by a monster. It was probably a liztroop.", "^2%s ^2got fragged by a monster. It was probably a liztroop.",
"^2%s ^2switched to team %d" "^2%s ^2switched to team %d"
}; };
*/
for (i=(sizeof(ppdeathstrings)/sizeof(ppdeathstrings[0]))-1;i>=0;i--) const char *ppdeathstrings[] =
{
"^02%s^02 beat %s^02 like a cur",
"^02%s^02 broke %s",
"^02%s^02 body bagged %s",
"^02%s^02 boned %s^02 like a fish",
"^02%s^02 castrated %s",
"^02%s^02 creamed %s",
"^02%s^02 crushed %s",
"^02%s^02 destroyed %s",
"^02%s^02 diced %s",
"^02%s^02 disemboweled %s",
"^02%s^02 eviscerated %s",
"^02%s^02 flattened %s",
"^02%s^02 gave AnAl MaDnEsS to %s",
"^02%s^02 gave %s^02 Anal Justice",
"^02%s^02 hosed %s",
"^02%s^02 hurt %s^02 real bad",
"^02%s^02 killed %s",
"^02%s^02 made dog meat out of %s",
"^02%s^02 made mincemeat out of %s",
"^02%s^02 massacred %s",
"^02%s^02 mutilated %s",
"^02%s^02 murdered %s",
"^02%s^02 neutered %s",
"^02%s^02 reamed %s",
"^02%s^02 ripped %s^02 a new orifice",
"^02%s^02 rocked %s",
"^02%s^02 sent %s^02 to hell",
"^02%s^02 slaughtered %s",
"^02%s^02 sliced %s",
"^02%s^02 smashed %s",
"^02%s^02 snuffed %s",
"^02%s^02 sodomized %s",
"^02%s^02 splattered %s",
"^02%s^02 sprayed %s",
"^02%s^02 squashed %s",
"^02%s^02 throttled %s",
"^02%s^02 toasted %s",
"^02%s^02 ventilated %s",
"^02%s^02 wasted %s",
};
const char *psdeathstrings[] =
{
"^02%s^02 is excrement",
"^02%s^02 is hamburger",
"^02%s^02 suffered scrotum separation",
"^02%s^02 volunteered for population control",
"^02%s^02 has suicided",
};
g_NumObituaries = (sizeof(ppdeathstrings)/sizeof(ppdeathstrings[0]));
for (i=g_NumObituaries-1;i>=0;i--)
{ {
if (fta_quotes[i+PPDEATHSTRINGS] == NULL) if (fta_quotes[i+PPDEATHSTRINGS] == NULL)
{ {
@ -5866,12 +5924,13 @@ void loadefs(const char *filenam)
} }
} }
for (i=(sizeof(podeathstrings)/sizeof(podeathstrings[0]))-1;i>=0;i--) g_NumSelfObituaries = (sizeof(psdeathstrings)/sizeof(psdeathstrings[0]));
for (i=g_NumSelfObituaries-1;i>=0;i--)
{ {
if (fta_quotes[i+PSDEATHSTRINGS] == NULL) if (fta_quotes[i+PSDEATHSTRINGS] == NULL)
{ {
fta_quotes[i+PSDEATHSTRINGS] = Bcalloc(MAXQUOTELEN,sizeof(char)); fta_quotes[i+PSDEATHSTRINGS] = Bcalloc(MAXQUOTELEN,sizeof(char));
Bstrcpy(fta_quotes[i+PSDEATHSTRINGS],podeathstrings[i]); Bstrcpy(fta_quotes[i+PSDEATHSTRINGS],psdeathstrings[i]);
} }
} }
} }

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

@ -2891,7 +2891,7 @@ cheat_for_port_credits:
"Show inv & pickup messages", "Show inv & pickup messages",
"HUD weapon display", "HUD weapon display",
"Use alternate HUD", "Use alternate HUD",
"Demo playback cameras", "Use camera view in demos",
"-", "-",
"DM: Ignore map votes", "DM: Ignore map votes",
"DM: Use private messages", "DM: Use private messages",

115
polymer/eduke32/source/player.c
View file

@ -3291,6 +3291,9 @@ void checkweapons(player_struct *p)
} }
} }
int g_NumObituaries = 0;
int g_NumSelfObituaries = 0;
void processinput(int snum) void processinput(int snum)
{ {
int j, i, k, doubvel, fz, cz, hz, lz, truefdist, x, y, shrunk; int j, i, k, doubvel, fz, cz, hz, lz, truefdist, x, y, shrunk;
@ -3590,56 +3593,55 @@ void processinput(int snum)
if (ud.obituaries) if (ud.obituaries)
{ {
char name1[32],name2[32]; /*
if (GTFLAGS(GAMETYPE_FLAG_PLAYERSFRIENDLY) || (GTFLAGS(GAMETYPE_FLAG_TDM) && g_player[snum].ps->team == g_player[p->frag_ps].ps->team))
if (GTFLAGS(GAMETYPE_FLAG_PLAYERSFRIENDLY) || (GTFLAGS(GAMETYPE_FLAG_TDM) && g_player[snum].ps->team == g_player[p->frag_ps].ps->team)) i = 9;
i = 9; else
else {
{ // temp_data[1] on a player's APLAYER actor means the player is frozen
// temp_data[1] on a player's APLAYER actor means the player is frozen if (hittype[p->i].temp_data[1] == 1)
if (hittype[p->i].temp_data[1] == 1) i = 7;
i = 7; else switch (dynamictostatic[hittype[p->i].picnum])
else switch (dynamictostatic[hittype[p->i].picnum]) {
{ case KNEE__STATIC:
case KNEE__STATIC: i = 0;
i = 0; break;
break; case SHOTSPARK1__STATIC:
case SHOTSPARK1__STATIC: switch (g_player[p->frag_ps].ps->curr_weapon)
switch (g_player[p->frag_ps].ps->curr_weapon) {
{ default:
default: case PISTOL_WEAPON:
case PISTOL_WEAPON: i = 1;
i = 1; break;
break; case SHOTGUN_WEAPON:
case SHOTGUN_WEAPON: i = 2;
i = 2; break;
break; case CHAINGUN_WEAPON:
case CHAINGUN_WEAPON: i = 3;
i = 3; break;
break; }
} break;
break; case RPG__STATIC:
case RPG__STATIC: i = 4;
i = 4; break;
break; case RADIUSEXPLOSION__STATIC:
case RADIUSEXPLOSION__STATIC: i = 5;
i = 5; break;
break; case SHRINKSPARK__STATIC:
case SHRINKSPARK__STATIC: i = 6;
i = 6; break;
break; case GROWSPARK__STATIC:
case GROWSPARK__STATIC: i = 8;
i = 8; break;
break; default:
default: i = 0;
i = 0; break;
break; }
} }
} */
Bstrcpy(name1,&g_player[snum].user_name[0]); Bsprintf(tempbuf,fta_quotes[PPDEATHSTRINGS+(krand()%g_NumObituaries)],
Bstrcpy(name2,&g_player[p->frag_ps].user_name[0]); &g_player[p->frag_ps].user_name[0],
&g_player[snum].user_name[0]);
Bsprintf(tempbuf,fta_quotes[PPDEATHSTRINGS+i+(mulscale(krand(), 3, 16)*10)],name1,name2);
if (ud.config.ScreenWidth >= 800) if (ud.config.ScreenWidth >= 800)
adduserquote(tempbuf); adduserquote(tempbuf);
else OSD_Printf("%s\n",tempbuf); else OSD_Printf("%s\n",tempbuf);
@ -3652,13 +3654,16 @@ void processinput(int snum)
{ {
p->fraggedself++; p->fraggedself++;
if (badguypic(sprite[p->wackedbyactor].picnum)) if (badguypic(sprite[p->wackedbyactor].picnum))
i = 2; Bsprintf(tempbuf,fta_quotes[PPDEATHSTRINGS+(krand()%g_NumObituaries)],"A monster",&g_player[snum].user_name[0]);
else if (hittype[p->i].picnum == NUKEBUTTON) else if (hittype[p->i].picnum == NUKEBUTTON)
i = 1; Bsprintf(tempbuf,"^02%s^02 tried to leave",&g_player[snum].user_name[0]);
else i = 0; else
Bsprintf(tempbuf,fta_quotes[PSDEATHSTRINGS+i],&g_player[snum].user_name[0]); {
// random suicide death string
Bsprintf(tempbuf,fta_quotes[PSDEATHSTRINGS+(krand()%g_NumSelfObituaries)],&g_player[snum].user_name[0]);
}
} }
else Bsprintf(tempbuf,fta_quotes[PSDEATHSTRINGS+3],&g_player[snum].user_name[0],p->team+1); else Bsprintf(tempbuf,"^02%s^02 switched to team %d",&g_player[snum].user_name[0],p->team+1);
if (ud.obituaries) if (ud.obituaries)
{ {

6
polymer/eduke32/source/sector.c
View file

@ -284,9 +284,9 @@ void doanimations(void)
{ {
stopinterpolation(animateptr[i]); stopinterpolation(animateptr[i]);
// This fixes a bug where wall or floor sprites contained in // This fixes a bug where wall or floor sprites contained in
// elevator sectors (ST 16-19) would jitter vertically after the // elevator sectors (ST 16-19) would jitter vertically after the
// elevator had stopped. // elevator had stopped.
if (animateptr[i] == &sector[animatesect[i]].floorz) if (animateptr[i] == &sector[animatesect[i]].floorz)
for (j=headspritesect[dasect];j>=0;j=nextspritesect[j]) for (j=headspritesect[dasect];j>=0;j=nextspritesect[j])
if (sprite[j].statnum != 3) if (sprite[j].statnum != 3)