Commit ca3b2f2f authored by alistert's avatar alistert

Fixed multiplayer scoring.

parent 5e941c85
......@@ -282,7 +282,7 @@ int ServerGame::step (unsigned int ticks) {
for (pcount = 0; pcount < nPlayers; pcount++) {
if (players[pcount].getTeam() ==
recvBuffers[pcount][2])
recvBuffers[count][2])
players[pcount].teamScore++;
}
......
......@@ -3,12 +3,12 @@
*
* movable.cpp
*
* 15th January 2005: Created movable.cpp
* 15th January 2010: Created movable.cpp
*
* Part of the OpenJazz project
*
*
* Copyright (c) 2005-2009 Alister Thomson
* Copyright (c) 2005-2010 Alister Thomson
*
* OpenJazz is distributed under the terms of
* the GNU General Public License, version 2.0
......
......@@ -3,12 +3,12 @@
*
* movable.h
*
* 15th January 2005: Created movable.h
* 15th January 2010: Created movable.h
*
* Part of the OpenJazz project
*
*
* Copyright (c) 2005-2009 Alister Thomson
* Copyright (c) 2005-2010 Alister Thomson
*
* OpenJazz is distributed under the terms of
* the GNU General Public License, version 2.0
......
......@@ -47,7 +47,7 @@ class Bird : public Movable {
private:
Player *player;
bool fleeing;
int fireTime;
unsigned int fireTime;
public:
Bird (Player *player, unsigned char gX, unsigned char gY);
......
......@@ -129,7 +129,7 @@ void Scene::ParseAni(File* f, int dataIndex) {
type = f->loadShort();
if(type == 0x4C53) { // SL
unsigned short int offset = f->loadShort();
/*unsigned short int offset =*/ f->loadShort();
unsigned char noSounds = f->loadChar();
for(loop = 0;loop<noSounds;loop++) {
char* soundName = f->loadString();
......@@ -337,7 +337,7 @@ void Scene::ParseData(File *f) {
void Scene::ParseScripts(File *f) {
int loop;
char *string;
int bgIndex = 0;
/*int bgIndex = 0;*/
int textAlignment = 0;
int textFont = 0;
for(loop = 0;loop < scriptItems; loop++)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment