kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@344 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2006-08-20 15:33:36 +00:00
parent 9382c6b9e7
commit 245e9d8e3d
10 changed files with 60 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+3 -2
View File
@@ -139,7 +139,7 @@ void respawnself()
void respawn()
{
if(player1->state==CS_DEAD)
if(player1->state==CS_DEAD && lastmillis>player1->lastaction+3000)
{
player1->attacking = false;
if(m_arena) { conoutf("waiting for new round to start..."); return; };
@@ -392,7 +392,8 @@ void attack(bool on)
{
if(intermission) return;
if(editmode) editdrag(on);
else if(player1->attacking = on) respawn();
else if(player1->state==CS_DEAD) respawn();
else player1->attacking = on;
};
void jumpn(bool on) { if(!intermission && (player1->jumpnext = on) ) respawn(); };
source/src/entities.cpp
+2 -2
View File
@@ -126,7 +126,7 @@ void realpickup(int n, dynent *d)
player1->thrownademillis = 0;
break;
case I_HEALTH:
radditem(n, d->health, 7);
radditem(n, d->health, 7);
break;
case I_ARMOUR:
radditem(n, d->armour, 8);
@@ -146,7 +146,7 @@ void realpickup(int n, dynent *d)
void additem(int i, int &v, int spawnsec, int t)
{
if(v<itemstats[t-1].max)
if(v<itemstats[t].max)
{
addmsg(1, 3, SV_ITEMPICKUP, i, spawnsec);
ents[i].spawned = false;
source/src/main.cpp
+3
View File
@@ -161,12 +161,15 @@ int main(int argc, char **argv)
if(!installtex(2, path(newstring("packages/misc/newchars.png")), xs, ys) ||
!installtex(3, path(newstring("packages/misc/base.png")), xs, ys) ||
!installtex(7, path(newstring("packages/misc/smoke.png")), xs, ys) ||
!installtex(8, path(newstring("packages/misc/full_logo.png")), xs, ys) ||
!installtex(4, path(newstring("packages/misc/explosion.jpg")), xs, ys) ||
!installtex(5, path(newstring("packages/misc/items.png")), xs, ys) ||
!installtex(10, path(newstring("packages/misc/scope.png")), xs, ys) ||
!installtex(11, path(newstring("packages/misc/flag_icons.png")), xs, ys) ||
!installtex(1, path(newstring("packages/misc/crosshairs/default.png")), xs, ys)) fatal("could not find core textures (hint: run cube from the parent of the bin directory)");
loadingscreen();
log("sound");
initsound();
source/src/protos.h
+1
View File
@@ -174,6 +174,7 @@ extern void renderphysents();
extern bool scoped;
extern void togglescope(bool deactivate = false);
extern void addgib(dynent *d);
extern void loadingscreen();
// renderparticles
extern void setorient(vec &r, vec &u);
source/src/renderextras.cpp
+44 -13
View File
@@ -411,8 +411,6 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
}
};
glPopMatrix();
glPushMatrix();
@@ -601,24 +599,30 @@ void renderphysents()
physent *p = physents[i];
if(!p) continue;
string model;
float z = p->o.z;
switch(p->state)
{
case NADE_THROWED:
strcpy_s(model, "weapons/grenade/static");
break;
case GIB:
default:
sprintf_s(model)("misc/gib0%i", (((int)p)%2)+1);
printf("%i\n", (((int)p)%3)+1);
break;
case NADE_THROWED:
strcpy_s(model, "weapons/grenade/static");
break;
case GIB:
default:
sprintf_s(model)("misc/gib0%i", (((4*(int)p))%3)+1);
int t = lastmillis-p->millis;
if(t>p->timetolife-2000)
{
t -= p->timetolife-2000;
z -= t*t/4000000000.0f*t;
}
break;
}
path(model);
rendermodel(model, 0, 1, 0, 0, p->o.x, p->o.z, p->o.y, p->yaw, p->pitch, false, 2.0f, 100.0f, 0, 0);
rendermodel(model, 0, 1, 0, 0, p->o.x, z, p->o.y, p->yaw, p->pitch, false, 2.0f, 100.0f, 0, 0);
};
};
VAR(numgibs, 0, 10, 100);
VAR(numgibs, 0, 6, 100);
void addgib(dynent *d)
{
@@ -629,7 +633,7 @@ void addgib(dynent *d)
physent *p = new_physent();
p->owner = d;
p->millis = lastmillis;
p->timetolife = 4000;
p->timetolife = 5000+rnd(10)*100;
p->state = GIB;
p->isphysent = true;
@@ -648,3 +652,30 @@ void addgib(dynent *d)
}
};
void loadingscreen()
{
glPushMatrix();
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glOrtho(0, VIRTW, VIRTH, 0, -1, 1);
glDisable(GL_DEPTH_TEST);
glEnable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
glBindTexture(GL_TEXTURE_2D, 8);
glBegin(GL_QUADS);
glTexCoord2f(0, 0); glVertex2i(0, 0);
glTexCoord2f(1, 0); glVertex2i(VIRTW, 0);
glTexCoord2f(1, 1); glVertex2i(VIRTW, VIRTH);
glTexCoord2f(0, 1); glVertex2i(0, VIRTH);
glEnd();
SDL_GL_SwapBuffers();
glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
glPopMatrix();
}
source/src/rendergl.cpp
+1 -2
View File
@@ -298,7 +298,7 @@ void drawhudgun(int w, int h, float aspect, int farplane)
glMatrixMode(GL_MODELVIEW);
rendermd3gun();
rendermenumdl(); // lazy bastard
rendermenumdl();
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
@@ -415,4 +415,3 @@ void gl_drawframe(int w, int h, float changelod, float curfps)
glEnable(GL_CULL_FACE);
glEnable(GL_FOG);
};
source/src/rendermd3.cpp
-6
View File
@@ -423,12 +423,6 @@ struct weaponmove
if(percent_done>=100 || percent_done<0) percent_done = 100;
k_rot = -(sin((float)(percent_done*2/100.0f*90.0f)*PI/180.0f)*90);
}
/*else if(throwingnade && timediff>animtime+rtime/2 && timediff<animtime && player1->lastaction && player1->lastattackgun==player1->gunselect)
{
anim = MDL_GUN_IDLE;
float percent_done = (float)50.0f+(timediff-(animtime-rtime/2))*100.0f/rtime;
k_rot = -(sin((float)(percent_done*2/100.0f*90.0f)*PI/180.0f)*90);
}*/
else
{
vec sway = base;
source/src/savegamedemo.cpp
+3 -2
View File
@@ -342,9 +342,10 @@ void demoplaybackstep()
void stopn() { if(demoplayback) stopreset(); else stop(); conoutf("demo stopped"); };
COMMAND(record, ARG_1STR);
// sorry :/
/*COMMAND(record, ARG_1STR);
COMMAND(demo, ARG_1STR);
COMMANDN(stop, stopn, ARG_NONE);
COMMANDN(stop, stopn, ARG_NONE);*/
COMMAND(savegame, ARG_1STR);
COMMAND(loadgame, ARG_1STR);
source/src/weapon.cpp
+2 -4
View File
@@ -443,7 +443,6 @@ void throw_nade(dynent *d, vec &to, physent *p)
if(d==player1)
{
player1->lastaction = lastmillis;
conoutf("throw %i\n", lastmillis-p->millis);
addmsg(1, 9, SV_SHOT, d->gunselect, (int)(from.x*DMF), (int)(from.y*DMF), (int)(from.z*DMF), (int)(to.x*DMF), (int)(to.y*DMF), (int)(to.z*DMF), lastmillis-p->millis);
};
};
@@ -454,7 +453,6 @@ physent *new_nade(dynent *d, int millis = 0)
p->owner = d;
p->millis = lastmillis;
p->timetolife = 2000-millis;
conoutf("newnade %i", p->timetolife);
p->state = NADE_ACTIVATED;
d->inhandnade = p;
@@ -622,6 +620,7 @@ void shoot(dynent *d, vec &targ)
if(d->weaponchanging || attacktime<d->gunwait) return;
d->gunwait = 0;
d->reloading = false;
if(d->attacking && !d->inhandnade) // activate
{
@@ -631,7 +630,6 @@ void shoot(dynent *d, vec &targ)
d->gunwait = grenadepulltime;
d->lastaction = lastmillis;
d->lastattackgun = d->gunselect;
d->reloading = false;
}
else if(!d->attacking && d->inhandnade && attacktime>grenadepulltime) // throw
{
@@ -643,13 +641,13 @@ void shoot(dynent *d, vec &targ)
{
if(d->weaponchanging || attacktime<d->gunwait) return;
d->gunwait = 0;
d->reloading = false;
if(!d->attacking) { d->shots = 0; return; };
d->lastaction = lastmillis;
d->lastattackgun = d->gunselect;
if(!hasammo(d)) { d->shots = 0; return; };
d->reloading = false;
if(guns[d->gunselect].isauto) d->shots++;
else d->attacking = false;
source/src/worldio.cpp
+1
View File
@@ -211,6 +211,7 @@ extern void preload_mapmodels();
void load_world(char *mname) // still supports all map formats that have existed since the earliest cube betas!
{
loadingscreen();
preparectf(true);
stopifrecording();
cleardlights();