zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-05 05:10:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Nothing important

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@317 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-10-19 00:45:36 +00:00
parent 874e32a3a5
commit eac09688bc
5 changed files with 64 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
polymer/eduke32/source/actors.c
View file

@ -406,6 +406,8 @@ SKIPWALLCHECK:
if ( s->picnum == RPG && sj->extra > 0) if ( s->picnum == RPG && sj->extra > 0)
hittype[j].picnum = RPG; hittype[j].picnum = RPG;
else if(checkspriteflags(i,SPRITE_FLAG_PROJECTILE) && thisprojectile[i].workslike & PROJECTILE_FLAG_RADIUS_PICNUM && sj->extra > 0)
hittype[j].picnum = s->picnum;
else else
{ {
if( s->picnum == SHRINKSPARK ) if( s->picnum == SHRINKSPARK )
@ -2742,11 +2744,6 @@ void moveweapons(void)
} }
} }
if(thisprojectile[i].workslike & RPG && sector[s->sectnum].lotag == 2 && s->xrepeat >= 10 && rnd(140))
spawn(i,WATERBUBBLE);
if(thisprojectile[i].workslike & PROJECTILE_FLAG_RPG) if(thisprojectile[i].workslike & PROJECTILE_FLAG_RPG)
{ {
if (thisprojectile[i].spawns > 0) if (thisprojectile[i].spawns > 0)

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

@ -20,6 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
#define VERSION " 1.4.0 svn"
#define HEAD "EDuke32"VERSION" (shareware mode)"
#define HEAD2 "EDuke32"VERSION
#include "compat.h" #include "compat.h"
#ifdef __cplusplus #ifdef __cplusplus
@ -836,7 +841,8 @@ enum projectileflags {
PROJECTILE_FLAG_NOAIM = 4096, PROJECTILE_FLAG_NOAIM = 4096,
PROJECTILE_FLAG_RANDDECALSIZE = 8192, PROJECTILE_FLAG_RANDDECALSIZE = 8192,
PROJECTILE_FLAG_EXPLODEONTIMER = 16384, PROJECTILE_FLAG_EXPLODEONTIMER = 16384,
PROJECTILE_FLAG_RPG_IMPACT = 32768 PROJECTILE_FLAG_RPG_IMPACT = 32768,
PROJECTILE_FLAG_RADIUS_PICNUM = 65536
}; };
typedef struct { typedef struct {

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

@ -45,11 +45,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "util_lib.h" #include "util_lib.h"
#define VERSION " 1.4.0 beta 2.1"
#define HEAD "EDuke32"VERSION" (shareware mode)"
#define HEAD2 "EDuke32"VERSION
#define IDFSIZE 479985668 #define IDFSIZE 479985668
#define IDFILENAME "DUKE3D.IDF" #define IDFILENAME "DUKE3D.IDF"
@ -7135,17 +7130,17 @@ FOUNDCHEAT:
return; return;
case CHEAT_MONSTERS: case CHEAT_MONSTERS:
{ {
char *s[] = { "ON", "OFF", "ON (BLOCKING)" }; char *s[] = { "ON", "OFF", "ON (BLOCKING)" };
actor_tog++; actor_tog++;
if(actor_tog == 3) actor_tog = 0; if(actor_tog == 3) actor_tog = 0;
ps[screenpeek].cheat_phase = 0; ps[screenpeek].cheat_phase = 0;
Bsprintf(fta_quotes[122],"MONSTERS: %s",s[actor_tog]); Bsprintf(fta_quotes[122],"MONSTERS: %s",s[actor_tog]);
FTA(122,&ps[myconnectindex]); FTA(122,&ps[myconnectindex]);
KB_FlushKeyBoardQueue(); KB_FlushKeyBoardQueue();
return; return;
} }
case CHEAT_RESERVED: case CHEAT_RESERVED:
case CHEAT_RESERVED3: case CHEAT_RESERVED3:
ud.eog = 1; ud.eog = 1;
@ -8328,6 +8323,9 @@ void Logo(void)
flushperms(); flushperms();
nextpage(); nextpage();
if (VOLUMEALL) wm_setapptitle(HEAD2);
else wm_setapptitle(HEAD);
MUSIC_StopSong(); MUSIC_StopSong();
FX_StopAllSounds(); // JBF 20031228 FX_StopAllSounds(); // JBF 20031228
clearsoundlocks(); // JBF 20031228 clearsoundlocks(); // JBF 20031228
@ -8903,6 +8901,8 @@ void backtomenu(void)
ps[myconnectindex].gm = MODE_MENU; ps[myconnectindex].gm = MODE_MENU;
cmenu(0); cmenu(0);
KB_FlushKeyboardQueue(); KB_FlushKeyboardQueue();
if (VOLUMEALL) wm_setapptitle(HEAD2);
else wm_setapptitle(HEAD);
} }
int load_script(char *szScript) int load_script(char *szScript)
@ -10630,6 +10630,9 @@ void dobonus(char bonusonly)
350, 380,VICTORY1+8,86,59 350, 380,VICTORY1+8,86,59
}; };
if (VOLUMEALL) wm_setapptitle(HEAD2);
else wm_setapptitle(HEAD);
if (ud.volume_number == 0 && ud.last_level == 8 && boardfilename[0]) { if (ud.volume_number == 0 && ud.last_level == 8 && boardfilename[0]) {
lastmapname = Bstrrchr(boardfilename,'\\'); lastmapname = Bstrrchr(boardfilename,'\\');
if (!lastmapname) lastmapname = Bstrrchr(boardfilename,'/'); if (!lastmapname) lastmapname = Bstrrchr(boardfilename,'/');

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

@ -509,7 +509,7 @@ void check_player_color(int *color,int prev_color)
int i, disallowed[] = { 1, 2, 3, 4, 5, 6, 7, 8, 17, 18, 19, 20, 22 }; int i, disallowed[] = { 1, 2, 3, 4, 5, 6, 7, 8, 17, 18, 19, 20, 22 };
for(i=0;i<(signed)(sizeof(disallowed)/sizeof(disallowed[0]));i++) { for(i=0;i<(signed)(sizeof(disallowed)/sizeof(disallowed[0]));i++) {
if(*color == disallowed[i]) { while(*color == disallowed[i]) {
if(*color > prev_color) if(*color > prev_color)
(*color)++; (*color)++;
else (*color)--; else (*color)--;
@ -1406,7 +1406,7 @@ void menus(void)
if (!VOLUMEALL || !PLUTOPAK) { if (!VOLUMEALL || !PLUTOPAK) {
//rotatesprite(c<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64,0,0,xdim-1,ydim-1); //rotatesprite(c<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64,0,0,xdim-1,ydim-1);
rotatesprite(c<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1); rotatesprite(c<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1);
menutext(c,24,0,0,current_menu == 998 ? "PORT CREDITS" : "CREDITS"); menutext(c,24,0,0,current_menu == 998 ? "ABOUT EDUKE32" : "CREDITS");
l = 8; l = 8;
} else { } else {
@ -1579,41 +1579,32 @@ void menus(void)
break; break;
case 993: // JBF 20031220 case 993: // JBF 20031220
rotatesprite(160<<16,200<<15,65536L,0,MENUSCREEN,0,0,10+64,0,0,xdim-1,ydim-1); rotatesprite(160<<16,200<<15,65536L,0,MENUSCREEN,0,0,10+64,0,0,xdim-1,ydim-1);
menutext(160,28,0,0,"PORT CREDITS"); menutext(160,28,0,0,"ABOUT EDUKE32");
cheat_for_port_credits: cheat_for_port_credits:
if (conversion == 13) l = (-2); if (conversion == 13) l = (-2);
gametext(160,38-l,"EDUKE PORT TO JFDUKE, NEW FEATURES,",0,2+8+16); gametext(160,38-l,"GAME PROGRAMMING",0,2+8+16);
gametext(160,38+8-l,"FUNCTIONS, AND ENGINE MODIFICATIONS",0,2+8+16); p = "Richard \"TerminX\" Gobeille";
p = "Richard \"TerminX\" Gobeille, EDuke32 team"; minitext(161-(Bstrlen(p)<<1), 39+10-l, p, 4, 10+16+128);
minitext(160-(Bstrlen(p)<<1), 38+8+10-l, p, 8, 10+16+128); minitext(160-(Bstrlen(p)<<1), 38+10-l, p, 8, 10+16+128);
gametext(160,70-l,"DUKE3D AND BUILD ENGINE PORTING,",0,2+8+16); gametext(160,57-l,"\"JFDUKE3D\" AND \"JFBUILD\" CODE",0,2+8+16);
gametext(160,70+8-l, "MODIFICATIONS, AND GENERAL GUIDANCE",0,2+8+16);
p = "Jonathon \"JonoF\" Fowler"; p = "Jonathon \"JonoF\" Fowler";
minitext(160-(Bstrlen(p)<<1), 70+8+10-l, p, 8, 10+16+128); minitext(161-(Bstrlen(p)<<1), 58+10-l, p, 4, 10+16+128);
minitext(160-(Bstrlen(p)<<1), 57+10-l, p, 8, 10+16+128);
gametext(160,102-l,"\"POLYMOST\" OPENGL RENDERER",0,2+8+16); gametext(160,76-l,"ORIGINAL \"POLYMOST\" RENDERER",0,2+8+16);
gametext(160,102+8-l,"NETWORKING, OTHER CODE",0,2+8+16); gametext(160,76+8-l,"NETWORKING, OTHER CODE",0,2+8+16);
p = "Ken Silverman"; p = "Ken Silverman";
minitext(160-(Bstrlen(p)<<1), 102+8+10-l, p, 8, 10+16+128); minitext(161-(Bstrlen(p)<<1), 77+8+10-l, p, 4, 10+16+128);
minitext(160-(Bstrlen(p)<<1), 76+8+10-l, p, 8, 10+16+128);
gametext(160,103-l,"RENDERING FEATURES",0,2+8+16);
p = "Pierre-Loup Archambeaud Griffais";
minitext(161-(Bstrlen(p)<<1), 104+10-l, p, 4, 10+16+128);
minitext(160-(Bstrlen(p)<<1), 103+10-l, p, 8, 10+16+128);
// /* for (i=0;i<7;i++) { gametext(160,122-l,"OTHER",0,2+8+16);
// switch (i) {
// case 0: p = "This program is distributed under the terms of the"; break;
// case 1: p = "GNU General Public License version 2 as published by the"; break;
// case 2: p = "Free Software Foundation. See GNU.TXT for details."; break;
// case 3: p = NULL; break;
// case 4: p = "Visit http://www.eduke32.com for the source code,"; break;
// case 5: p = "latest news, and the current version of this port."; break;
// case 6: p = "EDuke originally by Matt Saettler."; break;
// }
// if (!p) continue;
// //minitext(160-(Bstrlen(p)<<1)+1, 110+10+1+(i*7)-l, p, 4, 10+16+128);
// minitext(160-(Bstrlen(p)<<1), 130+10+(i*7)-l, p, /*12*/8, 10+16+128);
// }
// */
{ {
const char *scroller[] = { const char *scroller[] = {
"This program is distributed under the terms of the", "This program is distributed under the terms of the",
@ -1633,7 +1624,6 @@ cheat_for_port_credits:
"Lachlan McDonald", "Lachlan McDonald",
"Matthew Palmer", "Matthew Palmer",
"Peter Green", "Peter Green",
"Pierre-Loup Archambeaud Griffais",
"", "",
"--x--", "--x--",
"", "",
@ -1645,18 +1635,14 @@ cheat_for_port_credits:
const int numlines = sizeof(scroller)/sizeof(char *); const int numlines = sizeof(scroller)/sizeof(char *);
for (m=0,i=(totalclock/104)%numlines; m<6; m++,i++) { for (m=0,i=(totalclock/104)%numlines; m<6; m++,i++) {
if (i==numlines) i=0; if (i==numlines) i=0;
minitext(161-(Bstrlen(scroller[i])<<1), 101+10+10+8+4+(m*7)-l, (char*)scroller[i], 4, 10+16+128);
minitext(160-(Bstrlen(scroller[i])<<1), 100+10+10+8+4+(m*7)-l, (char*)scroller[i], 8, 10+16+128); minitext(160-(Bstrlen(scroller[i])<<1), 100+10+10+8+4+(m*7)-l, (char*)scroller[i], 8, 10+16+128);
} }
} }
for (i=0;i<2;i++) { p = "Visit www.eduke32.com for news and updates";
switch (i) { minitext(161-(Bstrlen(p)<<1), 136+10+10+10+10+4-l, p, 4, 10+16+128);
case 0: p = "www.eduke32.com"; break; minitext(160-(Bstrlen(p)<<1), 135+10+10+10+10+4-l, p, 8, 10+16+128);
case 1: p = ""; break; // fuck I am lazy
}
minitext(160-(Bstrlen(p)<<1), 135+10+10+10+10+4+(i*7)-l, p, 8, 10+16+128);
}
break;
} }
break; break;

14
polymer/eduke32/source/premap.c
View file

@ -1672,6 +1672,20 @@ int enterlevel(char g)
//Bsprintf(g_szBuf,"ENTERLEVEL L=%d V=%d",ud.level_number, ud.volume_number); //Bsprintf(g_szBuf,"ENTERLEVEL L=%d V=%d",ud.level_number, ud.volume_number);
//AddLog(g_szBuf); //AddLog(g_szBuf);
// variables are set by pointer... // variables are set by pointer...
if (VOLUMEALL) Bsprintf(tempbuf,HEAD2);
else Bsprintf(tempbuf,HEAD);
if( boardfilename[0] != 0 && ud.m_level_number == 7 && ud.m_volume_number == 0 )
{
Bstrcpy(levname, boardfilename);
Bsprintf(apptitle," - %s",levname);
}
else Bsprintf(apptitle," - %s",level_names[(ud.volume_number*11)+ud.level_number]);
Bstrcat(tempbuf,apptitle);
wm_setapptitle(tempbuf);
OnEvent(EVENT_ENTERLEVEL, -1, -1, -1); OnEvent(EVENT_ENTERLEVEL, -1, -1, -1);
return 0; return 0;
} }