~ubuntu-branches/debian/squeeze/warzone2100/squeeze

Committer: Bazaar Package Importer
Author(s): Paul Wise
Date: 2010-08-05 21:08:56 UTC
mfrom: (1.4.3 upstream)
Revision ID: james.westby@ubuntu.com-20100805210856-qolydu7ht9w8u3rd

Tags: 2.3.3-1

http://bugs.debian.org/591215

* New upstream bugfix release
- Fixes issues in 2.3.2 (Closes: #591215)
- Upstream community renamed, update copyright information

files added:
macosx/Resources/wzlocal/ko.lproj

macosx/Resources/wzlocal/ko.lproj/InfoPlist.strings

po/ko.gmo

po/ko.po

files modified:
ChangeLog

autorevision.conf

build_tools/autorevision/autorevision.cpp

configure

configure.ac

debian/changelog

debian/copyright

lib/exceptionhandler/dumpinfo.cpp

lib/exceptionhandler/dumpinfo.h

lib/exceptionhandler/exceptionhandler.c

lib/exceptionhandler/exceptionhandler.h

lib/exceptionhandler/exchndl.c

lib/exceptionhandler/exchndl.h

lib/framework/configfile.c

lib/framework/configfile.h

lib/framework/cursors.c

lib/framework/cursors.h

lib/framework/cursors16.c

lib/framework/cursors32.c

lib/framework/debug.c

lib/framework/debug.h

lib/framework/endian_hack.h

lib/framework/file.h

lib/framework/fixedpoint.h

lib/framework/frame.c

lib/framework/frame.h

lib/framework/frameint.h

lib/framework/frameresource.c

lib/framework/frameresource.h

lib/framework/i18n.c

lib/framework/i18n.h

lib/framework/input.c

lib/framework/input.h

lib/framework/lexer_input.c

lib/framework/lexer_input.h

lib/framework/listmacs.h

lib/framework/macros.h

lib/framework/math_ext.h

lib/framework/physfs_ext.h

lib/framework/resly.h

lib/framework/resource_lexer.l

lib/framework/resource_lexer.lex.c

lib/framework/resource_parser.y

lib/framework/stdio_ext.c

lib/framework/stdio_ext.h

lib/framework/string_ext.h

lib/framework/strres.c

lib/framework/strres.h

lib/framework/strres_lexer.l

lib/framework/strres_lexer.lex.c

lib/framework/strres_parser.y

lib/framework/strresly.h

lib/framework/treap.c

lib/framework/treap.h

lib/framework/trig.c

lib/framework/trig.h

lib/framework/types.h

lib/framework/utf.c

lib/framework/utf.h

lib/framework/vector.h

lib/framework/wzglobal.h

lib/framework/x-motif-messagebox.c

lib/framework/x-motif-messagebox.h

lib/gamelib/anim.c

lib/gamelib/anim.h

lib/gamelib/animobj.c

lib/gamelib/animobj.h

lib/gamelib/audp_lexer.l

lib/gamelib/audp_lexer.lex.c

lib/gamelib/audp_parser.y

lib/gamelib/gtime.c

lib/gamelib/gtime.h

lib/gamelib/hashtable.c

lib/gamelib/hashtable.h

lib/gamelib/parser.h

lib/ivis_common/bitimage.c

lib/ivis_common/bitimage.h

lib/ivis_common/imd.c

lib/ivis_common/imd.h

lib/ivis_common/imdload.c

lib/ivis_common/ivi.h

lib/ivis_common/ivisdef.h

lib/ivis_common/ivispatch.h

lib/ivis_common/pieblitfunc.h

lib/ivis_common/pieclip.c

lib/ivis_common/pieclip.h

lib/ivis_common/piedef.h

lib/ivis_common/piefunc.h

lib/ivis_common/piemode.h

lib/ivis_common/piepalette.h

lib/ivis_common/piestate.c

lib/ivis_common/piestate.h

lib/ivis_common/pietypes.h

lib/ivis_common/png_util.c

lib/ivis_common/png_util.h

lib/ivis_common/rendmode.h

lib/ivis_common/tex.h

lib/ivis_common/textdraw.h

lib/ivis_opengl/ivi.c

lib/ivis_opengl/pieblitfunc.c

lib/ivis_opengl/piedraw.c

lib/ivis_opengl/piefunc.c

lib/ivis_opengl/piematrix.c

lib/ivis_opengl/piematrix.h

lib/ivis_opengl/piemode.c

lib/ivis_opengl/piepalette.c

lib/ivis_opengl/piestate.c

lib/ivis_opengl/rendmode.c

lib/ivis_opengl/screen.c

lib/ivis_opengl/screen.h

lib/ivis_opengl/tex.c

lib/ivis_opengl/textdraw.c

lib/netplay/netjoin_stub.c

lib/netplay/netlog.c

lib/netplay/netlog.h

lib/netplay/netplay.c

lib/netplay/netplay.h

lib/netplay/nettypes.c

lib/netplay/nettypes.h

lib/script/chat_lexer.l

lib/script/chat_lexer.lex.c

lib/script/chat_parser.y

lib/script/chat_processing.h

lib/script/codeprint.c

lib/script/codeprint.h

lib/script/event.c

lib/script/event.h

lib/script/eventsave.c

lib/script/eventsave.h

lib/script/interpreter.c

lib/script/interpreter.h

lib/script/parse.h

lib/script/script.c

lib/script/script.h

lib/script/script_lexer.l

lib/script/script_lexer.lex.c

lib/script/script_parser.y

lib/script/stack.c

lib/script/stack.h

lib/sequence/sequence.c

lib/sequence/sequence.h

lib/sequence/timer.c

lib/sequence/timer.h

lib/sound/aud.h

lib/sound/audio.c

lib/sound/audio.h

lib/sound/audio_id.c

lib/sound/audio_id.h

lib/sound/cdaudio.c

lib/sound/cdaudio.h

lib/sound/mixer.h

lib/sound/oggvorbis.c

lib/sound/oggvorbis.h

lib/sound/openal_error.c

lib/sound/openal_error.h

lib/sound/openal_track.c

lib/sound/playlist.c

lib/sound/playlist.h

lib/sound/track.c

lib/sound/track.h

lib/sound/tracklib.h

lib/widget/bar.c

lib/widget/bar.h

lib/widget/button.c

lib/widget/button.h

lib/widget/editbox.c

lib/widget/editbox.h

lib/widget/form.c

lib/widget/form.h

lib/widget/label.c

lib/widget/label.h

lib/widget/scrap.c

lib/widget/scrap.h

lib/widget/slider.c

lib/widget/slider.h

lib/widget/tip.c

lib/widget/tip.h

lib/widget/widgbase.h

lib/widget/widget.c

lib/widget/widget.h

lib/widget/widgint.h

macosx/Warzone.xcodeproj/project.pbxproj

pkg/dpkg/changelog

po/LINGUAS

po/POTFILES.in

po/cs.gmo

po/cs.po

po/da.gmo

po/da.po

po/de.gmo

po/de.po

po/en_GB.gmo

po/en_GB.po

po/es.gmo

po/es.po

po/et_EE.gmo

po/et_EE.po

po/fi.gmo

po/fi.po

po/fr.gmo

po/fr.po

po/fy.gmo

po/fy.po

po/ga.gmo

po/ga.po

po/hr.gmo

po/hr.po

po/it.gmo

po/it.po

po/la.gmo

po/la.po

po/lt.gmo

po/lt.po

po/nb.gmo

po/nb.po

po/nl.gmo

po/nl.po

po/pl.gmo

po/pl.po

po/pt.gmo

po/pt.po

po/pt_BR.gmo

po/pt_BR.po

po/ro.gmo

po/ro.po

po/ru.gmo

po/ru.po

po/sl.gmo

po/sl.po

po/uk_UA.gmo

po/uk_UA.po

po/warzone2100.pot

po/zh_CN.gmo

po/zh_CN.po

po/zh_TW.gmo

po/zh_TW.po

src/action.c

src/action.h

src/advvis.c

src/advvis.h

src/ai.c

src/ai.h

src/aiexperience.c

src/aiexperience.h

src/anim_id.h

src/astar.c

src/astar.h

src/atmos.c

src/atmos.h

src/aud.c

src/basedef.h

src/baseobject.c

src/baseobject.h

src/bridge.c

src/bridge.h

src/bucket3d.c

src/bucket3d.h

src/challenge.c

src/challenge.h

src/cheat.c

src/cheat.h

src/clparse.c

src/clparse.h

src/cluster.c

src/cluster.h

src/cmddroid.c

src/cmddroid.h

src/cmddroiddef.h

src/combat.c

src/combat.h

src/component.c

src/component.h

src/configuration.c

src/configuration.h

src/console.c

src/console.h

src/data.c

src/data.h

src/design.c

src/design.h

src/difficulty.c

src/difficulty.h

src/display.c

src/display.h

src/display3d.c

src/display3d.h

src/display3ddef.h

src/displaydef.h

src/drive.c

src/drive.h

src/droid.c

src/droid.h

src/droiddef.h

src/e3demo.c

src/e3demo.h

src/edit3d.c

src/edit3d.h

src/effects.c

src/effects.h

src/environ.c

src/environ.h

src/feature.c

src/feature.h

src/featuredef.h

src/formation.c

src/formation.h

src/formationdef.h

src/fpath.c

src/fpath.h

src/frend.h

src/frontend.c

src/frontend.h

src/function.c

src/function.h

src/functiondef.h

src/game.c

src/game.h

src/gateway.c

src/gateway.h

src/gatewaydef.h

src/geometry.c

src/geometry.h

src/group.c

src/group.h

src/hci.c

src/hci.h

src/ingameop.c

src/ingameop.h

src/init.c

src/init.h

src/intdisplay.c

src/intdisplay.h

src/intelmap.c

src/intelmap.h

src/intfac.h

src/intimage.c

src/intimage.h

src/intorder.c

src/intorder.h

src/keybind.c

src/keybind.h

src/keyedit.c

src/keyedit.h

src/keymap.c

src/keymap.h

src/level_lexer.l

src/level_lexer.lex.c

src/levelint.h

src/levels.c

src/levels.h

src/lighting.c

src/lighting.h

src/loadsave.c

src/loadsave.h

src/loop.c

src/loop.h

src/main.c

src/main.h

src/map.c

src/map.h

src/mapdisplay.c

src/mapdisplay.h

src/mapgrid.c

src/mapgrid.h

src/mechanics.c

src/mechanics.h

src/message.c

src/message.h

src/message_lexer.l

src/message_lexer.lex.c

src/message_parser.y

src/messagedef.h

src/messagely.h

src/miscimd.c

src/miscimd.h

src/mission.c

src/mission.h

src/missiondef.h

src/modding.h

src/move.c

src/move.h

src/movedef.h

src/multibot.c

src/multigifts.c

src/multigifts.h

src/multiint.c

src/multiint.h

src/multijoin.c

src/multijoin.h

src/multilimit.c

src/multilimit.h

src/multimenu.c

src/multimenu.h

src/multiopt.c

src/multiplay.c

src/multiplay.h

src/multirecv.h

src/multistat.c

src/multistat.h

src/multistruct.c

src/multisync.c

src/objectdef.h

src/objects.c

src/objects.h

src/objmem.c

src/objmem.h

src/oprint.c

src/oprint.h

src/order.c

src/order.h

src/orderdef.h

src/parsetest.c

src/parsetest.h

src/positiondef.h

src/power.c

src/power.h

src/projectile.c

src/projectile.h

src/projectiledef.h

src/radar.c

src/radar.h

src/raycast.c

src/raycast.h

src/research.c

src/research.h

src/researchdef.h

src/scores.c

src/scores.h

src/scriptai.c

src/scriptai.h

src/scriptcb.c

src/scriptcb.h

src/scriptextern.c

src/scriptextern.h

src/scriptfuncs.c

src/scriptfuncs.h

src/scriptobj.c

src/scriptobj.h

src/scripttabs.c

src/scripttabs.h

src/scriptvals.c

src/scriptvals.h

src/scriptvals_lexer.l

src/scriptvals_lexer.lex.c

src/scriptvals_parser.y

src/selection.c

src/selection.h

src/seqdisp.c

src/seqdisp.h

src/stats.c

src/stats.h

src/statsdef.h

src/stringdef.h

src/structure.c

src/structure.h

src/structuredef.h

src/target.c

src/target.h

src/text.c

src/text.h

src/texture.c

src/texture.h

src/transporter.c

src/transporter.h

src/version.c

src/version.h

src/visibility.c

src/visibility.h

src/warcam.c

src/warcam.h

src/warzoneconfig.c

src/warzoneconfig.h

src/weapondef.h

src/wrappers.c

src/wrappers.h

win32/warzone2100.rc

Show diffs side-by-side

added added

removed removed

src/multistat.c

This file is part of Warzone 2100.

Warzone 2100 is free software; you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

{

uint32_t playerIndex = (uint32_t)player;

if (playerIndex >= MAX_PLAYERS)

{

return true;

}

// First copy over the data into our local array

memcpy(&playerStats[playerIndex], &plStats, sizeof(plStats));

// update the stats

NETuint32_t(&playerIndex);

if (playerIndex >= MAX_PLAYERS)

{

return;

}

100

// we don't what to update ourselves, we already know our score (FIXME: rewrite setMultiStats())

101

if (!myResponsibility(playerIndex))

102

{

200

210

}

201

211

// FIXME: Why in the world are we using two different structs for stats when we can use only one?

202

212

// Host controls self + AI, so update the scores for them as well.

203

if(myResponsibility(attacker) && NetPlay.bComms)

213

if (attacker < MAX_PLAYERS)

204

214

{

205

st = getMultiStats(attacker); // get stats

206

if(NetPlay.bComms)

215

if (myResponsibility(attacker) && NetPlay.bComms)

207

216

{

208

st.scoreToAdd += (2*inflicted);

217

st = getMultiStats(attacker); // get stats

218

if (NetPlay.bComms)

219

{

220

st.scoreToAdd += (2 * inflicted);

221

}

222

else

223

{

224

st.recentScore += (2 * inflicted);

225

}

226

setMultiStats(attacker, st, true);

209

227

}

210

228

else

211

229

{

212

st.recentScore += (2*inflicted);

230

ingame.skScores[attacker][0] += (2 * inflicted); // increment skirmish players rough score.

213

231

}

214

setMultiStats(attacker, st, true);

215

}

216

else

217

{

218

ingame.skScores[attacker][0] += (2*inflicted); // increment skirmish players rough score.

219

232

}

220

233

221

234

// FIXME: Why in the world are we using two different structs for stats when we can use only one?

222

235

// Host controls self + AI, so update the scores for them as well.

223

if(myResponsibility(defender) && NetPlay.bComms)

236

if (defender < MAX_PLAYERS)

224

237

{

225

st = getMultiStats(defender); // get stats

226

if(NetPlay.bComms)

238

if (myResponsibility(defender) && NetPlay.bComms)

227

239

{

228

st.scoreToAdd -= inflicted;

240

st = getMultiStats(defender); // get stats

241

if (NetPlay.bComms)

242

{

243

st.scoreToAdd -= inflicted;

244

}

245

else

246

{

247

st.recentScore -= inflicted;

248

}

249

setMultiStats(defender, st, true);

229

250

}

230

251

else

231

252

{

232

st.recentScore -= inflicted;

253

ingame.skScores[defender][0] -= inflicted; // increment skirmish players rough score.

233

254

}

234

setMultiStats(defender, st, true);

235

}

236

else

237

{

238

ingame.skScores[defender][0] -= inflicted; // increment skirmish players rough score.

239

255

}

240

256

}

241

257

Older »