Here is the nightly for OS X on 19 Aug 2015 - Revision 8b4f7dd
Open non-feature issues in
Mantis: 126
Group: Standard
fso_Standard_20150819_8b4f7dd.tgzMD5Sum------------------------------------------------------------------------
commit 17851dc
Author: Goober5000 <Tue Aug 18 21:32:14 2015 -0400>
Commit: Goober5000 <Tue Aug 18 21:32:14 2015 -0400>
fix an obscure edge-case sexp crash
code/parse/sexp.cpp | 40 ++++++++++++++++++++++++++--------------
1 file changed, 26 insertions(+), 14 deletions(-)
------------------------------------------------------------------------
commit efce7de
Author: Goober5000 <Tue Aug 18 19:58:34 2015 -0400>
Commit: Goober5000 <Tue Aug 18 19:58:34 2015 -0400>
fix syntax error, add node reference
code/parse/sexp.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit 2b032a1
Author: Goober5000 <Tue Aug 18 13:27:57 2015 -0400>
Commit: Goober5000 <Tue Aug 18 13:27:57 2015 -0400>
tweaks per MageKing17's suggestions
code/parse/sexp.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit ce3755b
Author: MageKing17 <Tue Aug 18 08:07:07 2015 -0700>
Commit: MageKing17 <Tue Aug 18 08:11:11 2015 -0700>
Further hook variables cleanup.
code/freespace2/freespace.cpp | 4 ----
code/object/collidedebrisship.cpp | 8 +++-----
code/object/collidedebrisweapon.cpp | 4 ++--
code/object/collideweaponweapon.cpp | 2 +-
code/ship/ship.cpp | 2 +-
code/ship/shiphit.cpp | 3 +--
6 files changed, 8 insertions(+), 15 deletions(-)
------------------------------------------------------------------------
commit 313787e
Author: MageKing17 <Tue Aug 18 07:58:03 2015 -0700>
Commit: MageKing17 <Tue Aug 18 07:58:03 2015 -0700>
Add RemHookVars() calls to aiturret.cpp, object.cpp, and ship.cpp.
code/ai/aiturret.cpp | 1 +
code/object/object.cpp | 1 +
code/ship/ship.cpp | 5 +++++
3 files changed, 7 insertions(+)
------------------------------------------------------------------------
commit e1d3838
Author: Goober5000 <Tue Aug 18 01:00:43 2015 -0400>
Commit: Goober5000 <Tue Aug 18 01:00:43 2015 -0400>
various assertions to improve the sexp code
code/fred2/messageeditordlg.cpp | 2 ++
code/parse/sexp.cpp | 7 +++++--
2 files changed, 7 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit 488a0f1
Author: MageKing17 <Fri Aug 14 11:24:47 2015 -0700>
Commit: MageKing17 <Fri Aug 14 11:24:47 2015 -0700>
Fix infinite trigger count not interacting correctly with "+Interval:"
code/mission/missiongoals.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
------------------------------------------------------------------------
commit 57c9e1a
Author: Echelon9 <Tue Jun 23 10:16:59 2015 +1000>
Commit: Echelon9 <Tue Jun 23 10:16:59 2015 +1000>
Address putative requirement for mm/mmreg.h to have <windows.h> included first.
code/sound/acm.h | 1 +
1 file changed, 1 insertion(+)
------------------------------------------------------------------------
commit 418b9e0
Author: Echelon9 <Mon Jun 22 20:20:46 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:31 2015 +1000>
Simplify duplicative weapon/ includes, which are in weapon/weapon.h
code/weapon/beam.cpp | 1 -
1 file changed, 1 deletion(-)
------------------------------------------------------------------------
commit d2f5575
Author: Echelon9 <Mon Jun 22 20:14:19 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:31 2015 +1000>
Simplify duplicative ui/ includes.
code/ui/listbox.cpp | 1 -
code/ui/slider2.cpp | 1 -
code/ui/window.cpp | 3 ---
3 files changed, 5 deletions(-)
------------------------------------------------------------------------
commit 8c12aff
Author: Echelon9 <Mon Jun 22 20:07:09 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:31 2015 +1000>
Simplify duplicative species_def/ includes, which are in species_def/species_def.h
code/species_defs/species_defs.cpp | 2 --
1 file changed, 2 deletions(-)
------------------------------------------------------------------------
commit ca552b4
Author: Echelon9 <Mon Jun 22 19:38:14 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:31 2015 +1000>
Simplify duplicative ship/ includes, which are in ship/shipfx.h
code/ship/shipfx.cpp | 1 -
1 file changed, 1 deletion(-)
------------------------------------------------------------------------
commit 00bfe37
Author: Echelon9 <Mon Jun 22 19:32:05 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:31 2015 +1000>
Simplify duplicative radar/ includes.
code/radar/radar.cpp | 3 ---
code/radar/radardradis.cpp | 3 ---
code/radar/radarorb.cpp | 3 ---
code/radar/radarsetup.cpp | 2 --
4 files changed, 11 deletions(-)
------------------------------------------------------------------------
commit 2964132
Author: Echelon9 <Mon Jun 22 19:25:40 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:31 2015 +1000>
Properly guard inclusion of playerman/managepilot.h
code/playerman/managepilot.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
------------------------------------------------------------------------
commit eb739e2
Author: Echelon9 <Mon Jun 22 19:19:20 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:31 2015 +1000>
Simplify duplicative pilotfile/ includes, which are in pilotfile/pilotfile.h
code/pilotfile/csg.cpp | 1 -
code/pilotfile/pilotfile.cpp | 1 -
code/pilotfile/pilotfile_convert.cpp | 2 --
code/pilotfile/plr.cpp | 1 -
4 files changed, 5 deletions(-)
------------------------------------------------------------------------
commit 8c2c451
Author: Echelon9 <Mon Jun 22 19:15:10 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:31 2015 +1000>
Simplify duplicative parse/ includes.
code/parse/lua.cpp | 2 --
code/parse/parselo.cpp | 1 -
code/parse/scripting.cpp | 1 -
code/parse/sexp.h | 6 +++---
4 files changed, 3 insertions(+), 7 deletions(-)
------------------------------------------------------------------------
commit 29faabd
Author: Echelon9 <Mon Jun 22 18:59:10 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:31 2015 +1000>
Simplify duplicative object/ includes.
code/object/collideshipweapon.cpp | 1 -
code/object/collideweaponweapon.cpp | 1 -
code/object/deadobjectdock.cpp | 1 -
code/object/deadobjectdock.h | 2 +-
code/object/objectdock.cpp | 1 -
code/object/objectdock.h | 1 +
code/object/objectsnd.cpp | 1 -
7 files changed, 2 insertions(+), 6 deletions(-)
------------------------------------------------------------------------
commit 2b251e3
Author: Echelon9 <Mon Jun 22 18:44:05 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:31 2015 +1000>
Simplify duplicative model/ includes.
code/model/modelinterp.cpp | 2 --
code/model/modelread.cpp | 1 -
code/model/modelrender.cpp | 3 ---
3 files changed, 6 deletions(-)
------------------------------------------------------------------------
commit ed2170b
Author: Echelon9 <Mon Jun 22 18:35:50 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:31 2015 +1000>
Simplify duplicative mod_table/ includes.
code/mod_table/mod_table.cpp | 1 -
1 file changed, 1 deletion(-)
------------------------------------------------------------------------
commit 493d9a4
Author: Echelon9 <Mon Jun 22 18:32:53 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:31 2015 +1000>
Simplify duplicative missionui/ includes.
code/missionui/fictionviewer.cpp | 1 -
1 file changed, 1 deletion(-)
------------------------------------------------------------------------
commit a7e6be3
Author: Echelon9 <Mon Jun 22 18:27:39 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Simplify duplicative mission/ includes.
code/mission/missionparse.cpp | 1 -
code/mission/missiontraining.cpp | 1 -
2 files changed, 2 deletions(-)
------------------------------------------------------------------------
commit dd3a6c2
Author: Echelon9 <Mon Jun 22 18:22:41 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Simplify duplicative menuui/ includes.
code/menuui/fishtank.h | 2 +-
code/menuui/mainhallmenu.h | 8 ++++----
code/menuui/optionsmenumulti.cpp | 1 -
code/menuui/readyroom.h | 4 ++++
4 files changed, 9 insertions(+), 6 deletions(-)
------------------------------------------------------------------------
commit 97a134e
Author: Echelon9 <Mon Jun 22 18:04:19 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Simplify duplicative math/ includes.
code/math/floating.cpp | 2 --
code/math/fvi.cpp | 4 ----
code/math/spline.cpp | 1 -
code/math/staticrand.cpp | 1 -
code/math/vecmat.cpp | 2 --
code/math/vecmat.h | 1 -
6 files changed, 11 deletions(-)
------------------------------------------------------------------------
commit e613f4d
Author: Echelon9 <Mon Jun 22 17:51:05 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Simplify duplicative lab/ includes, which are in lab/wmcgui.h
code/lab/lab.cpp | 1 -
code/lab/wmcgui.cpp | 1 -
2 files changed, 2 deletions(-)
------------------------------------------------------------------------
commit 47af1ff
Author: Echelon9 <Mon Jun 22 17:46:30 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Simplify duplicative hud/ includes.
code/hud/hud.cpp | 2 --
code/hud/hudbrackets.cpp | 1 -
code/hud/hudescort.cpp | 2 --
code/hud/hudets.cpp | 1 -
code/hud/hudlock.cpp | 2 --
code/hud/hudmessage.cpp | 3 ---
code/hud/hudparse.cpp | 1 -
code/hud/hudreticle.cpp | 1 -
code/hud/hudreticle.h | 1 -
code/hud/hudshield.cpp | 2 --
code/hud/hudsquadmsg.cpp | 2 --
code/hud/hudtarget.cpp | 2 --
code/hud/hudtarget.h | 1 -
code/hud/hudtargetbox.cpp | 2 --
code/hud/hudtargetbox.h | 2 +-
code/hud/hudwingmanstatus.cpp | 2 --
16 files changed, 1 insertion(+), 26 deletions(-)
------------------------------------------------------------------------
commit 4e6f525
Author: Echelon9 <Mon Jun 22 17:30:08 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Simplify duplicative graphics/ includes.
code/graphics/2d.cpp | 2 --
code/graphics/generic.cpp | 3 ---
code/graphics/gropengl.cpp | 2 --
code/graphics/gropenglbmpman.cpp | 2 --
code/graphics/gropengldraw.cpp | 2 --
code/graphics/gropenglextension.cpp | 2 --
code/graphics/gropengllight.cpp | 1 -
code/graphics/gropenglshader.cpp | 2 --
code/graphics/gropenglstate.cpp | 2 --
code/graphics/gropengltexture.cpp | 3 ---
code/graphics/gropengltnl.cpp | 4 ----
code/graphics/shadows.cpp | 2 --
code/graphics/shadows.h | 8 ++++----
13 files changed, 4 insertions(+), 31 deletions(-)
------------------------------------------------------------------------
commit b25feb6
Author: Echelon9 <Mon Jun 22 17:14:54 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Simplify duplicative gamesnd/ includes, which are in gamesnd/gamesnd.h
code/gamesnd/gamesnd.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
------------------------------------------------------------------------
commit 90bb4e3
Author: Echelon9 <Mon Jun 22 17:10:40 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Simplify duplicative freespace2/ includes, which are in freespace2/freespace.h
code/freespace2/freespace.cpp | 2 --
1 file changed, 2 deletions(-)
------------------------------------------------------------------------
commit 39e1ed3
Author: Echelon9 <Mon Jun 22 17:06:12 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Simplify fireball/ include logic.
code/fireball/fireballs.cpp | 1 -
code/fireball/warpineffect.cpp | 2 --
2 files changed, 3 deletions(-)
------------------------------------------------------------------------
commit 4566446
Author: Echelon9 <Mon Jun 22 17:00:35 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Simplify debugconsole/ include logic.
code/debugconsole/console.cpp | 3 ---
code/debugconsole/consolecmds.cpp | 2 --
code/debugconsole/consoleparse.cpp | 3 +--
code/debugconsole/consoleparse.h | 1 +
4 files changed, 2 insertions(+), 7 deletions(-)
------------------------------------------------------------------------
commit 1601f83
Author: Echelon9 <Mon Jun 22 16:53:12 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Guard extraneous inclusion of globalincs/pstypes.h
code/controlconfig/controlsconfig.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit ae8a310
Author: Echelon9 <Mon Jun 22 16:45:45 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Simplify duplicative camera/ includes, which are in camera/camera.h
code/camera/camera.cpp | 2 --
1 file changed, 2 deletions(-)
------------------------------------------------------------------------
commit 0d35f90
Author: Echelon9 <Mon Jun 22 16:41:41 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Simplify duplicative autopilot/ includes, which are in autopilot/autopilot.h
code/autopilot/autopilot.cpp | 1 -
1 file changed, 1 deletion(-)
------------------------------------------------------------------------
commit 726036b
Author: Echelon9 <Mon Jun 22 16:36:55 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Simplify duplicative bmpman/ includes, which are in bmpman/bmpman.h
code/bmpman/bm_internal.h | 1 -
code/bmpman/bmpman.cpp | 2 --
2 files changed, 3 deletions(-)
------------------------------------------------------------------------
commit c5493bb
Author: Echelon9 <Mon Jun 22 16:18:42 2015 +1000>
Commit: Echelon9 <Mon Jun 22 20:24:30 2015 +1000>
Scripted sort and uniq on (internal) project includes. Improves search time and as a by product removed a number of duplicative includes.
code/ai/ai.h | 6 +-
code/ai/ai_profiles.cpp | 8 +-
code/ai/ai_profiles.h | 2 +-
code/ai/aibig.cpp | 14 ++--
code/ai/aicode.cpp | 76 ++++++++---------
code/ai/aigoals.cpp | 12 +--
code/ai/aiinternal.h | 3 +
code/ai/aiturret.cpp | 32 +++----
code/anim/animplay.cpp | 12 +--
code/anim/animplay.h | 2 +-
code/anim/packunpack.cpp | 2 +-
code/asteroid/asteroid.cpp | 40 ++++-----
code/asteroid/asteroid.h | 2 +-
code/autopilot/autopilot.cpp | 31 +++----
code/autopilot/autopilot.h | 1 +
code/bmpman/bmpman.cpp | 7 +-
code/camera/camera.cpp | 14 ++--
code/camera/camera.h | 6 +-
code/cfile/cfile.cpp | 4 +-
code/cfile/cfilelist.cpp | 2 +-
code/cfile/cfilesystem.cpp | 6 +-
code/cmdline/cmdline.cpp | 6 +-
code/cmeasure/cmeasure.cpp | 10 +--
code/controlconfig/controlsconfig.cpp | 22 ++---
code/controlconfig/controlsconfigcommon.cpp | 6 +-
code/cutscene/cutscenes.cpp | 14 ++--
code/cutscene/movie.cpp | 10 +--
code/cutscene/mvelib.cpp | 4 +-
code/cutscene/mveplayer.cpp | 19 ++---
code/cutscene/oggplayer.cpp | 18 ++--
code/debris/debris.cpp | 22 ++---
code/debugconsole/console.cpp | 2 +-
code/debugconsole/consoleparse.cpp | 3 +-
code/fireball/fireballs.cpp | 14 ++--
code/fireball/warpineffect.cpp | 14 ++--
code/freespace2/freespace.cpp | 13 ++-
code/fs2netd/fs2netd_client.cpp | 34 ++++----
code/fs2netd/protocol.h | 2 +-
code/fs2netd/tcp_client.cpp | 10 +--
code/fs2netd/tcp_client.h | 3 +-
code/gamehelp/contexthelp.cpp | 24 +++---
code/gamehelp/gameplayhelp.cpp | 12 +--
code/gamesnd/eventmusic.cpp | 16 ++--
code/gamesnd/gamesnd.cpp | 2 +-
code/gamesnd/gamesnd.h | 2 +-
code/globalincs/alphacolors.cpp | 4 +-
code/globalincs/alphacolors.h | 2 +-
code/globalincs/profiling.cpp | 2 +-
code/globalincs/systemvars.cpp | 2 +-
code/graphics/2d.cpp | 28 +++----
code/graphics/2d.h | 4 +-
code/graphics/font.cpp | 10 +--
code/graphics/generic.cpp | 10 +--
code/graphics/generic.h | 4 +-
code/graphics/grbatch.cpp | 10 +--
code/graphics/grinternal.h | 6 +-
code/graphics/gropengl.cpp | 43 +++++-----
code/graphics/gropenglbmpman.cpp | 22 ++---
code/graphics/gropenglbmpman.h | 2 +-
code/graphics/gropengldraw.cpp | 31 ++++---
code/graphics/gropengldraw.h | 2 +-
code/graphics/gropenglextension.cpp | 7 +-
code/graphics/gropengllight.cpp | 6 +-
code/graphics/gropenglpostprocessing.cpp | 13 ++-
code/graphics/gropenglshader.cpp | 18 ++--
code/graphics/gropenglshader.h | 1 -
code/graphics/gropenglstate.cpp | 2 +-
code/graphics/gropengltexture.cpp | 12 +--
code/graphics/gropengltnl.cpp | 20 ++---
code/graphics/gropengltnl.h | 4 +-
code/graphics/grstub.cpp | 16 ++--
code/graphics/shadows.cpp | 18 ++--
code/hud/hud.cpp | 22 ++---
code/hud/hud.h | 6 +-
code/hud/hudartillery.cpp | 22 ++---
code/hud/hudartillery.h | 2 +-
code/hud/hudbrackets.cpp | 25 +++---
code/hud/hudconfig.cpp | 16 ++--
code/hud/hudescort.cpp | 24 +++---
code/hud/hudets.cpp | 14 ++--
code/hud/hudlock.cpp | 24 +++---
code/hud/hudmessage.cpp | 36 ++++----
code/hud/hudmessage.h | 2 +-
code/hud/hudnavigation.cpp | 10 +--
code/hud/hudobserver.cpp | 4 +-
code/hud/hudparse.cpp | 24 +++---
code/hud/hudparse.h | 2 +-
code/hud/hudreticle.cpp | 12 +--
code/hud/hudshield.cpp | 18 ++--
code/hud/hudsquadmsg.cpp | 29 ++++---
code/hud/hudsquadmsg.h | 2 +-
code/hud/hudtarget.cpp | 52 ++++++------
code/hud/hudtargetbox.cpp | 38 ++++-----
code/hud/hudwingmanstatus.cpp | 16 ++--
code/iff_defs/iff_defs.cpp | 6 +-
code/iff_defs/iff_defs.h | 2 +-
code/jumpnode/jumpnode.cpp | 2 +-
code/lab/lab.cpp | 34 ++++----
code/lab/wmcgui.cpp | 8 +-
code/lab/wmcgui.h | 2 +-
code/lighting/lighting.cpp | 14 ++--
code/localization/localize.cpp | 4 +-
code/math/floating.cpp | 2 +-
code/math/floating.h | 2 +
code/math/fvi.cpp | 2 +-
code/math/spline.cpp | 6 +-
code/math/vecmat.cpp | 2 +-
code/menuui/barracks.cpp | 28 +++----
code/menuui/credits.cpp | 20 ++---
code/menuui/fishtank.cpp | 2 +-
code/menuui/mainhallmenu.cpp | 36 ++++----
code/menuui/mainhalltemp.cpp | 10 +--
code/menuui/optionsmenu.cpp | 30 +++----
code/menuui/optionsmenumulti.cpp | 22 ++---
code/menuui/playermenu.cpp | 28 +++----
code/menuui/readyroom.cpp | 28 +++----
code/menuui/snazzyui.cpp | 12 +--
code/menuui/techmenu.cpp | 28 +++----
code/menuui/trainingmenu.cpp | 2 +-
code/mission/missionbriefcommon.cpp | 30 +++----
code/mission/missionbriefcommon.h | 4 +-
code/mission/missioncampaign.cpp | 28 +++----
code/mission/missiongoals.cpp | 28 +++----
code/mission/missiongoals.h | 2 +-
code/mission/missiongrid.cpp | 4 +-
code/mission/missionhotkey.cpp | 26 +++---
code/mission/missionload.cpp | 14 ++--
code/mission/missionlog.cpp | 14 ++--
code/mission/missionlog.h | 2 +-
code/mission/missionmessage.cpp | 34 ++++----
code/mission/missionmessage.h | 2 +-
code/mission/missionparse.cpp | 70 ++++++++--------
code/mission/missionparse.h | 7 +-
code/mission/missiontraining.cpp | 30 +++----
code/missionui/chatbox.cpp | 16 ++--
code/missionui/fictionviewer.cpp | 12 +--
code/missionui/missionbrief.cpp | 52 ++++++------
code/missionui/missiondebrief.cpp | 58 ++++++-------
code/missionui/missionloopbrief.cpp | 21 +++--
code/missionui/missionpause.cpp | 20 ++---
code/missionui/missionscreencommon.cpp | 48 +++++------
code/missionui/missionscreencommon.h | 2 +-
code/missionui/missionshipchoice.cpp | 56 ++++++-------
code/missionui/missionweaponchoice.cpp | 36 ++++----
code/missionui/redalert.cpp | 32 +++----
code/mod_table/mod_table.cpp | 6 +-
code/mod_table/mod_table.h | 2 +-
code/model/model.h | 2 +-
code/model/modelanim.cpp | 6 +-
code/model/modelcollide.cpp | 6 +-
code/model/modelinterp.cpp | 34 ++++----
code/model/modeloctant.cpp | 4 +-
code/model/modelread.cpp | 24 +++---
code/model/modelrender.cpp | 18 ++--
code/model/modelrender.h | 6 +-
code/nebula/neb.cpp | 20 ++---
code/nebula/neb.h | 4 +-
code/nebula/neblightning.cpp | 11 +--
code/object/collidedebrisship.cpp | 12 +--
code/object/collidedebrisweapon.cpp | 6 +-
code/object/collideshipship.cpp | 22 ++---
code/object/collideshipweapon.cpp | 14 ++--
code/object/collideweaponweapon.cpp | 8 +-
code/object/objcollide.cpp | 6 +-
code/object/object.cpp | 4 +-
code/object/object.h | 2 +-
code/object/objectdock.cpp | 6 +-
code/object/objectsnd.cpp | 14 ++--
code/object/objectsort.cpp | 23 +++---
code/object/parseobjectdock.cpp | 4 +-
code/object/waypoint.cpp | 8 +-
code/observer/observer.cpp | 4 +-
code/palman/palman.cpp | 8 +-
code/parse/generic_log.cpp | 4 +-
code/parse/lua.cpp | 14 ++--
code/parse/lua.h | 2 +-
code/parse/parselo.cpp | 14 ++--
code/parse/parselo.h | 2 +-
code/parse/scripting.cpp | 21 ++---
code/parse/sexp.cpp | 124 ++++++++++++++--------------
code/particle/particle.cpp | 12 +--
code/physics/physics.cpp | 7 +-
code/pilotfile/csg.cpp | 26 +++---
code/pilotfile/csg_convert.cpp | 8 +-
code/pilotfile/pilotfile.h | 2 +-
code/pilotfile/pilotfile_convert.cpp | 2 +-
code/pilotfile/pilotfile_convert.h | 10 +--
code/pilotfile/plr.cpp | 22 ++---
code/pilotfile/plr_convert.cpp | 4 +-
code/playerman/managepilot.cpp | 32 +++----
code/playerman/player.h | 8 +-
code/playerman/playercontrol.cpp | 41 +++++----
code/pngutils/pngutils.cpp | 11 ++-
code/pngutils/pngutils.h | 2 +-
code/popup/popup.cpp | 15 ++--
code/popup/popupdead.cpp | 16 ++--
code/radar/radar.cpp | 32 +++----
code/radar/radardradis.cpp | 40 +++++----
code/radar/radarorb.cpp | 33 ++++----
code/radar/radarsetup.cpp | 36 ++++----
code/radar/radarsetup.h | 2 +-
code/render/3d.h | 6 +-
code/render/3dclipper.cpp | 2 +-
code/render/3ddraw.cpp | 8 +-
code/render/3dlaser.cpp | 8 +-
code/render/3dsetup.cpp | 4 +-
code/ship/afterburner.cpp | 14 ++--
code/ship/awacs.cpp | 10 +--
code/ship/shield.cpp | 6 +-
code/ship/ship.cpp | 112 ++++++++++++-------------
code/ship/ship.h | 18 ++--
code/ship/shipcontrails.cpp | 4 +-
code/ship/shipfx.cpp | 50 +++++------
code/ship/shiphit.cpp | 56 ++++++-------
code/sound/audiostr.cpp | 10 +--
code/sound/channel.h | 2 +
code/sound/ds.cpp | 14 ++--
code/sound/ds3d.cpp | 10 +--
code/sound/dscap.cpp | 2 +-
code/sound/fsspeech.cpp | 4 +-
code/sound/rtvoice.cpp | 2 +-
code/sound/sound.cpp | 21 ++---
code/sound/voicerec.cpp | 2 +-
code/species_defs/species_defs.cpp | 10 +--
code/species_defs/species_defs.h | 6 +-
code/starfield/nebula.cpp | 8 +-
code/starfield/starfield.cpp | 20 ++---
code/starfield/supernova.cpp | 18 ++--
code/stats/medals.cpp | 14 ++--
code/stats/scoring.cpp | 28 +++----
code/stats/scoring.h | 3 +-
code/stats/stats.cpp | 4 +-
code/ui/button.cpp | 6 +-
code/ui/checkbox.cpp | 4 +-
code/ui/gadget.cpp | 6 +-
code/ui/icon.cpp | 4 +-
code/ui/inputbox.cpp | 7 +-
code/ui/keytrap.cpp | 2 +-
code/ui/listbox.cpp | 8 +-
code/ui/radio.cpp | 4 +-
code/ui/scroll.cpp | 6 +-
code/ui/slider.cpp | 9 +-
code/ui/slider2.cpp | 6 +-
code/ui/uidefs.h | 2 +-
code/ui/uidraw.cpp | 4 +-
code/ui/uimouse.cpp | 4 +-
code/ui/window.cpp | 18 ++--
code/weapon/beam.cpp | 40 ++++-----
code/weapon/beam.h | 2 +-
code/weapon/corkscrew.cpp | 10 +--
code/weapon/emp.cpp | 18 ++--
code/weapon/flak.cpp | 2 +-
code/weapon/muzzleflash.cpp | 6 +-
code/weapon/shockwave.cpp | 16 ++--
code/weapon/shockwave.h | 2 +-
code/weapon/swarm.cpp | 8 +-
code/weapon/trails.cpp | 8 +-
code/weapon/weapon.h | 6 +-
code/weapon/weapons.cpp | 60 +++++++-------
259 files changed, 1896 insertions(+), 1917 deletions(-)
