Commit ca3b2f2f authored by alistert's avatar alistert

Fixed multiplayer scoring.

parent 5e941c85
...@@ -282,7 +282,7 @@ int ServerGame::step (unsigned int ticks) { ...@@ -282,7 +282,7 @@ int ServerGame::step (unsigned int ticks) {
for (pcount = 0; pcount < nPlayers; pcount++) { for (pcount = 0; pcount < nPlayers; pcount++) {
if (players[pcount].getTeam() == if (players[pcount].getTeam() ==
recvBuffers[pcount][2]) recvBuffers[count][2])
players[pcount].teamScore++; players[pcount].teamScore++;
} }
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
* *
* movable.cpp * movable.cpp
* *
* 15th January 2005: Created movable.cpp * 15th January 2010: Created movable.cpp
* *
* Part of the OpenJazz project * Part of the OpenJazz project
* *
* *
* Copyright (c) 2005-2009 Alister Thomson * Copyright (c) 2005-2010 Alister Thomson
* *
* OpenJazz is distributed under the terms of * OpenJazz is distributed under the terms of
* the GNU General Public License, version 2.0 * the GNU General Public License, version 2.0
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
* *
* movable.h * movable.h
* *
* 15th January 2005: Created movable.h * 15th January 2010: Created movable.h
* *
* Part of the OpenJazz project * Part of the OpenJazz project
* *
* *
* Copyright (c) 2005-2009 Alister Thomson * Copyright (c) 2005-2010 Alister Thomson
* *
* OpenJazz is distributed under the terms of * OpenJazz is distributed under the terms of
* the GNU General Public License, version 2.0 * the GNU General Public License, version 2.0
......
...@@ -45,9 +45,9 @@ class Player; ...@@ -45,9 +45,9 @@ class Player;
class Bird : public Movable { class Bird : public Movable {
private: private:
Player *player; Player *player;
bool fleeing; bool fleeing;
int fireTime; unsigned int fireTime;
public: public:
Bird (Player *player, unsigned char gX, unsigned char gY); Bird (Player *player, unsigned char gX, unsigned char gY);
......
...@@ -129,7 +129,7 @@ void Scene::ParseAni(File* f, int dataIndex) { ...@@ -129,7 +129,7 @@ void Scene::ParseAni(File* f, int dataIndex) {
type = f->loadShort(); type = f->loadShort();
if(type == 0x4C53) { // SL if(type == 0x4C53) { // SL
unsigned short int offset = f->loadShort(); /*unsigned short int offset =*/ f->loadShort();
unsigned char noSounds = f->loadChar(); unsigned char noSounds = f->loadChar();
for(loop = 0;loop<noSounds;loop++) { for(loop = 0;loop<noSounds;loop++) {
char* soundName = f->loadString(); char* soundName = f->loadString();
...@@ -337,7 +337,7 @@ void Scene::ParseData(File *f) { ...@@ -337,7 +337,7 @@ void Scene::ParseData(File *f) {
void Scene::ParseScripts(File *f) { void Scene::ParseScripts(File *f) {
int loop; int loop;
char *string; char *string;
int bgIndex = 0; /*int bgIndex = 0;*/
int textAlignment = 0; int textAlignment = 0;
int textFont = 0; int textFont = 0;
for(loop = 0;loop < scriptItems; loop++) 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