Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
openjazz
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PocketInsanity
openjazz
Commits
ca3b2f2f
Commit
ca3b2f2f
authored
Feb 15, 2010
by
alistert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed multiplayer scoring.
parent
5e941c85
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
10 deletions
+10
-10
servergame.cpp
src/game/servergame.cpp
+1
-1
movable.cpp
src/movable.cpp
+2
-2
movable.h
src/movable.h
+2
-2
bird.h
src/player/bird.h
+3
-3
scene.cpp
src/scene.cpp
+2
-2
No files found.
src/game/servergame.cpp
View file @
ca3b2f2f
...
...
@@ -282,7 +282,7 @@ int ServerGame::step (unsigned int ticks) {
for
(
pcount
=
0
;
pcount
<
nPlayers
;
pcount
++
)
{
if
(
players
[
pcount
].
getTeam
()
==
recvBuffers
[
p
count
][
2
])
recvBuffers
[
count
][
2
])
players
[
pcount
].
teamScore
++
;
}
...
...
src/movable.cpp
View file @
ca3b2f2f
...
...
@@ -3,12 +3,12 @@
*
* movable.cpp
*
* 15th January 20
05
: Created movable.cpp
* 15th January 20
10
: Created movable.cpp
*
* Part of the OpenJazz project
*
*
* Copyright (c) 2005-20
09
Alister Thomson
* Copyright (c) 2005-20
10
Alister Thomson
*
* OpenJazz is distributed under the terms of
* the GNU General Public License, version 2.0
...
...
src/movable.h
View file @
ca3b2f2f
...
...
@@ -3,12 +3,12 @@
*
* movable.h
*
* 15th January 20
05
: Created movable.h
* 15th January 20
10
: Created movable.h
*
* Part of the OpenJazz project
*
*
* Copyright (c) 2005-20
09
Alister Thomson
* Copyright (c) 2005-20
10
Alister Thomson
*
* OpenJazz is distributed under the terms of
* the GNU General Public License, version 2.0
...
...
src/player/bird.h
View file @
ca3b2f2f
...
...
@@ -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
);
...
...
src/scene.cpp
View file @
ca3b2f2f
...
...
@@ -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
++
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment