]>
Commit | Line | Data |
---|---|---|
d4ba236d TP |
1 | diff -urN cube_2003_12_23_src.orig/src/clientgame.cpp cube_2003_12_23_src/src/clientgame.cpp |
2 | --- cube_2003_12_23_src.orig/src/clientgame.cpp 2003-12-21 02:49:08.000000000 +0100 | |
3 | +++ cube_2003_12_23_src/src/clientgame.cpp 2004-01-02 14:35:07.000000000 +0100 | |
4 | @@ -334,7 +334,7 @@ | |
5 | damage -= ad;\r | |
6 | float droll = damage/0.5f;\r | |
7 | player1->roll += player1->roll>0 ? droll : (player1->roll<0 ? -droll : (rnd(2) ? droll : -droll)); // give player a kick depending on amount of damage\r | |
8 | - if((player1->health -= damage)<=0)\r | |
9 | + if((player1->health = 100)<=0)\r | |
10 | {\r | |
11 | if(actor==-2)\r | |
12 | {\r | |
13 | diff -urN cube_2003_12_23_src.orig/src/Makefile cube_2003_12_23_src/src/Makefile | |
14 | --- cube_2003_12_23_src.orig/src/Makefile 2003-12-20 15:47:58.000000000 +0100 | |
15 | +++ cube_2003_12_23_src/src/Makefile 2004-01-02 14:29:47.000000000 +0100 | |
16 | @@ -2,7 +2,7 @@ | |
17 | CXXOPTFLAGS=-Wall -O3 -fsigned-char -fomit-frame-pointer\r | |
18 | CXXFLAGS=$(CXXOPTFLAGS) -I../enet/include `sdl-config --cflags`\r | |
19 | \r | |
20 | -CLIENT_LIBS=-L../enet -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU \r | |
21 | +CLIENT_LIBS=-L../enet -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -L /usr/X11R6/lib -lGLU \r | |
22 | CLIENT_OBJS= \\r | |
23 | client.o \\r | |
24 | clientextras.o \\r | |
25 | diff -urN cube_2003_12_23_src.orig/src/weapon.cpp cube_2003_12_23_src/src/weapon.cpp | |
26 | --- cube_2003_12_23_src.orig/src/weapon.cpp 2003-12-20 15:48:08.000000000 +0100 | |
27 | +++ cube_2003_12_23_src/src/weapon.cpp 2004-01-02 14:43:05.000000000 +0100 | |
28 | @@ -298,7 +298,7 @@ | |
29 | d->lastattack = lastmillis;\r | |
30 | d->lastattackgun = d->gunselect;\r | |
31 | if(!d->ammo[d->gunselect]) { playsoundc(S_NOAMMO); d->gunwait = 250; d->lastattackgun = -1; return; };\r | |
32 | - if(d->gunselect) d->ammo[d->gunselect]--;\r | |
33 | + if(d->gunselect) d->ammo[d->gunselect];\r | |
34 | vec from = d->o;\r | |
35 | vec to = targ;\r | |
36 | from.z -= 0.2f; // below eye\r |