diff --git a/LICENSES b/LICENSES
index 244ff414ccb..0a07c907c89 100644
--- a/LICENSES
+++ b/LICENSES
@@ -6874,7 +6874,7 @@ radiant/bitmaps/grid_window.png | GNU General Public License 2.0 or later | Nate
radiant/bitmaps/particle_map.png | GNU General Public License 2.0 or later | Nate Wright
radiant/bitmaps/particle_weapon.png | GNU General Public License 2.0 or later | Nate Wright
radiant/bitmaps/texwindow_uniformsize.png | | orbweaver (commiter in darkradiant repository) | http://darkradiant.svn.sourceforge.net/viewvc/darkradiant/trunk/darkradiant/install/bitmaps/texwindow_uniformsize.png?view=markup&pathrev=309
-src/common/pqueue.c | Public Domain
+src/common/pqueue.cpp | Public Domain
src/common/pqueue.h | Public Domain
src/docs/pathfinding.odg | GNU Free Documentation License | Werner "hoehrer" Höhrer
src/docs/tex/chapters/geoscape.tex | GNU General Public License 2.0 | Eric Goller
diff --git a/build/modules/cgame-campaign.mk b/build/modules/cgame-campaign.mk
index 0ec08db33d3..e762c11f5d7 100644
--- a/build/modules/cgame-campaign.mk
+++ b/build/modules/cgame-campaign.mk
@@ -12,84 +12,84 @@ $(TARGET)_LDFLAGS += $(SO_LDFLAGS) $(MXML_LIBS) -lm
$(TARGET)_FILE := base/$(TARGET).$(SO_EXT)
$(TARGET)_SRCS = \
- client/cgame/campaign/cl_game_campaign.c \
- client/cgame/campaign/cp_aircraft.c \
- client/cgame/campaign/cp_aircraft_callbacks.c \
- client/cgame/campaign/cp_alien_interest.c \
- client/cgame/campaign/cp_base.c \
- client/cgame/campaign/cp_base_callbacks.c \
- client/cgame/campaign/cp_basedefence_callbacks.c \
- client/cgame/campaign/cp_building.c \
- client/cgame/campaign/cp_cgame_callbacks.c \
- client/cgame/campaign/cp_capacity.c \
- client/cgame/campaign/cp_hospital.c \
- client/cgame/campaign/cp_hospital_callbacks.c \
- client/cgame/campaign/cp_messages.c \
- client/cgame/campaign/cp_missions.c \
- client/cgame/campaign/cp_mission_triggers.c \
- client/cgame/campaign/cp_parse.c \
- client/cgame/campaign/cp_rank.c \
- client/cgame/campaign/cp_team.c \
- client/cgame/campaign/cp_team_callbacks.c \
- client/cgame/campaign/cp_time.c \
- client/cgame/campaign/cp_xvi.c \
- client/cgame/campaign/cp_alienbase.c \
- client/cgame/campaign/cp_aliencont.c \
- client/cgame/campaign/cp_aliencont_callbacks.c \
- client/cgame/campaign/cp_auto_mission.c \
- client/cgame/campaign/cp_mission_callbacks.c \
- client/cgame/campaign/cp_airfight.c \
- client/cgame/campaign/cp_campaign.c \
- client/cgame/campaign/cp_event.c \
- client/cgame/campaign/cp_employee.c \
- client/cgame/campaign/cp_employee_callbacks.c \
- client/cgame/campaign/cp_installation.c \
- client/cgame/campaign/cp_installation_callbacks.c \
- client/cgame/campaign/cp_market.c \
- client/cgame/campaign/cp_market_callbacks.c \
- client/cgame/campaign/cp_map.c \
- client/cgame/campaign/cp_mapfightequip.c \
- client/cgame/campaign/cp_nation.c \
- client/cgame/campaign/cp_produce.c \
- client/cgame/campaign/cp_produce_callbacks.c \
- client/cgame/campaign/cp_radar.c \
- client/cgame/campaign/cp_research.c \
- client/cgame/campaign/cp_research_callbacks.c \
- client/cgame/campaign/cp_save.c \
- client/cgame/campaign/cp_statistics.c \
- client/cgame/campaign/cp_transfer.c \
- client/cgame/campaign/cp_transfer_callbacks.c \
- client/cgame/campaign/cp_ufo.c \
- client/cgame/campaign/cp_ufopedia.c \
- client/cgame/campaign/cp_uforecovery.c \
- client/cgame/campaign/cp_uforecovery_callbacks.c \
- client/cgame/campaign/cp_messageoptions.c \
- client/cgame/campaign/cp_messageoptions_callbacks.c \
- client/cgame/campaign/cp_overlay.c \
- client/cgame/campaign/cp_popup.c \
- client/cgame/campaign/cp_fightequip_callbacks.c \
+ client/cgame/campaign/cl_game_campaign.cpp \
+ client/cgame/campaign/cp_aircraft.cpp \
+ client/cgame/campaign/cp_aircraft_callbacks.cpp \
+ client/cgame/campaign/cp_alien_interest.cpp \
+ client/cgame/campaign/cp_base.cpp \
+ client/cgame/campaign/cp_base_callbacks.cpp \
+ client/cgame/campaign/cp_basedefence_callbacks.cpp \
+ client/cgame/campaign/cp_building.cpp \
+ client/cgame/campaign/cp_cgame_callbacks.cpp \
+ client/cgame/campaign/cp_capacity.cpp \
+ client/cgame/campaign/cp_hospital.cpp \
+ client/cgame/campaign/cp_hospital_callbacks.cpp \
+ client/cgame/campaign/cp_messages.cpp \
+ client/cgame/campaign/cp_missions.cpp \
+ client/cgame/campaign/cp_mission_triggers.cpp \
+ client/cgame/campaign/cp_parse.cpp \
+ client/cgame/campaign/cp_rank.cpp \
+ client/cgame/campaign/cp_team.cpp \
+ client/cgame/campaign/cp_team_callbacks.cpp \
+ client/cgame/campaign/cp_time.cpp \
+ client/cgame/campaign/cp_xvi.cpp \
+ client/cgame/campaign/cp_alienbase.cpp \
+ client/cgame/campaign/cp_aliencont.cpp \
+ client/cgame/campaign/cp_aliencont_callbacks.cpp \
+ client/cgame/campaign/cp_auto_mission.cpp \
+ client/cgame/campaign/cp_mission_callbacks.cpp \
+ client/cgame/campaign/cp_airfight.cpp \
+ client/cgame/campaign/cp_campaign.cpp \
+ client/cgame/campaign/cp_event.cpp \
+ client/cgame/campaign/cp_employee.cpp \
+ client/cgame/campaign/cp_employee_callbacks.cpp \
+ client/cgame/campaign/cp_installation.cpp \
+ client/cgame/campaign/cp_installation_callbacks.cpp \
+ client/cgame/campaign/cp_market.cpp \
+ client/cgame/campaign/cp_market_callbacks.cpp \
+ client/cgame/campaign/cp_map.cpp \
+ client/cgame/campaign/cp_mapfightequip.cpp \
+ client/cgame/campaign/cp_nation.cpp \
+ client/cgame/campaign/cp_produce.cpp \
+ client/cgame/campaign/cp_produce_callbacks.cpp \
+ client/cgame/campaign/cp_radar.cpp \
+ client/cgame/campaign/cp_research.cpp \
+ client/cgame/campaign/cp_research_callbacks.cpp \
+ client/cgame/campaign/cp_save.cpp \
+ client/cgame/campaign/cp_statistics.cpp \
+ client/cgame/campaign/cp_transfer.cpp \
+ client/cgame/campaign/cp_transfer_callbacks.cpp \
+ client/cgame/campaign/cp_ufo.cpp \
+ client/cgame/campaign/cp_ufopedia.cpp \
+ client/cgame/campaign/cp_uforecovery.cpp \
+ client/cgame/campaign/cp_uforecovery_callbacks.cpp \
+ client/cgame/campaign/cp_messageoptions.cpp \
+ client/cgame/campaign/cp_messageoptions_callbacks.cpp \
+ client/cgame/campaign/cp_overlay.cpp \
+ client/cgame/campaign/cp_popup.cpp \
+ client/cgame/campaign/cp_fightequip_callbacks.cpp \
\
- client/cgame/campaign/missions/cp_mission_baseattack.c \
- client/cgame/campaign/missions/cp_mission_buildbase.c \
- client/cgame/campaign/missions/cp_mission_harvest.c \
- client/cgame/campaign/missions/cp_mission_intercept.c \
- client/cgame/campaign/missions/cp_mission_recon.c \
- client/cgame/campaign/missions/cp_mission_rescue.c \
- client/cgame/campaign/missions/cp_mission_supply.c \
- client/cgame/campaign/missions/cp_mission_terror.c \
- client/cgame/campaign/missions/cp_mission_xvi.c
+ client/cgame/campaign/missions/cp_mission_baseattack.cpp \
+ client/cgame/campaign/missions/cp_mission_buildbase.cpp \
+ client/cgame/campaign/missions/cp_mission_harvest.cpp \
+ client/cgame/campaign/missions/cp_mission_intercept.cpp \
+ client/cgame/campaign/missions/cp_mission_recon.cpp \
+ client/cgame/campaign/missions/cp_mission_rescue.cpp \
+ client/cgame/campaign/missions/cp_mission_supply.cpp \
+ client/cgame/campaign/missions/cp_mission_terror.cpp \
+ client/cgame/campaign/missions/cp_mission_xvi.cpp
ifneq ($(HARD_LINKED_CGAME),1)
- $(TARGET)_SRCS += shared/mathlib.c \
- shared/shared.c \
- shared/utf8.c \
- shared/parse.c \
- shared/infostring.c \
+ $(TARGET)_SRCS += shared/mathlib.cpp \
+ shared/shared.cpp \
+ shared/utf8.cpp \
+ shared/parse.cpp \
+ shared/infostring.cpp \
\
- game/q_shared.c \
- game/chr_shared.c \
- game/inv_shared.c \
- game/inventory.c
+ game/q_shared.cpp \
+ game/chr_shared.cpp \
+ game/inv_shared.cpp \
+ game/inventory.cpp
else
$(TARGET)_IGNORE := yes
endif
diff --git a/build/modules/cgame-multiplayer.mk b/build/modules/cgame-multiplayer.mk
index 5d442fc39ce..38e25041cc2 100644
--- a/build/modules/cgame-multiplayer.mk
+++ b/build/modules/cgame-multiplayer.mk
@@ -12,21 +12,21 @@ $(TARGET)_LDFLAGS += $(SO_LDFLAGS) $(MXML_LIBS) -lm
$(TARGET)_FILE := base/$(TARGET).$(SO_EXT)
$(TARGET)_SRCS = \
- client/cgame/multiplayer/cl_game_multiplayer.c \
- client/cgame/multiplayer/mp_callbacks.c \
- client/cgame/multiplayer/mp_serverlist.c
+ client/cgame/multiplayer/cl_game_multiplayer.cpp \
+ client/cgame/multiplayer/mp_callbacks.cpp \
+ client/cgame/multiplayer/mp_serverlist.cpp
ifneq ($(HARD_LINKED_CGAME),1)
- $(TARGET)_SRCS += shared/mathlib.c \
- shared/shared.c \
- shared/utf8.c \
- shared/parse.c \
- shared/infostring.c \
+ $(TARGET)_SRCS += shared/mathlib.cpp \
+ shared/shared.cpp \
+ shared/utf8.cpp \
+ shared/parse.cpp \
+ shared/infostring.cpp \
\
- game/q_shared.c \
- game/chr_shared.c \
- game/inv_shared.c \
- game/inventory.c
+ game/q_shared.cpp \
+ game/chr_shared.cpp \
+ game/inv_shared.cpp \
+ game/inventory.cpp
else
$(TARGET)_IGNORE := yes
endif
diff --git a/build/modules/cgame-skirmish.mk b/build/modules/cgame-skirmish.mk
index 3a80197a536..7b2194848f8 100644
--- a/build/modules/cgame-skirmish.mk
+++ b/build/modules/cgame-skirmish.mk
@@ -12,19 +12,19 @@ $(TARGET)_LDFLAGS += $(SO_LDFLAGS) $(MXML_LIBS) -lm
$(TARGET)_FILE := base/$(TARGET).$(SO_EXT)
$(TARGET)_SRCS = \
- client/cgame/skirmish/cl_game_skirmish.c
+ client/cgame/skirmish/cl_game_skirmish.cpp
ifneq ($(HARD_LINKED_CGAME),1)
- $(TARGET)_SRCS += shared/mathlib.c \
- shared/shared.c \
- shared/utf8.c \
- shared/parse.c \
- shared/infostring.c \
+ $(TARGET)_SRCS += shared/mathlib.cpp \
+ shared/shared.cpp \
+ shared/utf8.cpp \
+ shared/parse.cpp \
+ shared/infostring.cpp \
\
- game/q_shared.c \
- game/chr_shared.c \
- game/inv_shared.c \
- game/inventory.c
+ game/q_shared.cpp \
+ game/chr_shared.cpp \
+ game/inv_shared.cpp \
+ game/inventory.cpp
else
$(TARGET)_IGNORE := yes
endif
diff --git a/build/modules/cgame-staticcampaign.mk b/build/modules/cgame-staticcampaign.mk
index 052ed0e373e..940ff2c9987 100644
--- a/build/modules/cgame-staticcampaign.mk
+++ b/build/modules/cgame-staticcampaign.mk
@@ -12,23 +12,23 @@ $(TARGET)_LDFLAGS += $(SO_LDFLAGS) $(MXML_LIBS) -lm
$(TARGET)_FILE := base/$(TARGET).$(SO_EXT)
$(TARGET)_SRCS = \
- client/cgame/staticcampaign/cl_game_staticcampaign.c \
- client/cgame/staticcampaign/scp_missions.c \
- client/cgame/staticcampaign/scp_parse.c
+ client/cgame/staticcampaign/cl_game_staticcampaign.cpp \
+ client/cgame/staticcampaign/scp_missions.cpp \
+ client/cgame/staticcampaign/scp_parse.cpp
ifneq ($(HARD_LINKED_CGAME),1)
- $(TARGET)_SRCS += shared/mathlib.c \
- shared/shared.c \
- shared/utf8.c \
- shared/parse.c \
- shared/infostring.c \
+ $(TARGET)_SRCS += shared/mathlib.cpp \
+ shared/shared.cpp \
+ shared/utf8.cpp \
+ shared/parse.cpp \
+ shared/infostring.cpp \
\
- common/binaryexpressionparser.c \
+ common/binaryexpressionparser.cpp \
\
- game/q_shared.c \
- game/chr_shared.c \
- game/inv_shared.c \
- game/inventory.c \
+ game/q_shared.cpp \
+ game/chr_shared.cpp \
+ game/inv_shared.cpp \
+ game/inventory.cpp \
\
$(cgame-campaign_SRCS)
else
diff --git a/build/modules/game.mk b/build/modules/game.mk
index fd2d275bac8..91d7bc24a4d 100644
--- a/build/modules/game.mk
+++ b/build/modules/game.mk
@@ -17,73 +17,73 @@ ifeq ($(DEBUG),1)
endif
$(TARGET)_SRCS = \
- game/g_actor.c \
- game/g_ai.c \
- game/g_ai_lua.c \
- game/g_client.c \
- game/g_combat.c \
- game/g_cmds.c \
- game/g_edicts.c \
- game/g_events.c \
- game/g_func.c \
- game/g_inventory.c \
- game/g_main.c \
- game/g_match.c \
- game/g_mission.c \
- game/g_morale.c \
- game/g_move.c \
- game/g_phys.c \
- game/g_reaction.c \
- game/g_round.c \
- game/g_stats.c \
- game/g_spawn.c \
- game/g_svcmds.c \
- game/g_trigger.c \
- game/g_utils.c \
- game/g_vis.c \
+ game/g_actor.cpp \
+ game/g_ai.cpp \
+ game/g_ai_lua.cpp \
+ game/g_client.cpp \
+ game/g_combat.cpp \
+ game/g_cmds.cpp \
+ game/g_edicts.cpp \
+ game/g_events.cpp \
+ game/g_func.cpp \
+ game/g_inventory.cpp \
+ game/g_main.cpp \
+ game/g_match.cpp \
+ game/g_mission.cpp \
+ game/g_morale.cpp \
+ game/g_move.cpp \
+ game/g_phys.cpp \
+ game/g_reaction.cpp \
+ game/g_round.cpp \
+ game/g_stats.cpp \
+ game/g_spawn.cpp \
+ game/g_svcmds.cpp \
+ game/g_trigger.cpp \
+ game/g_utils.cpp \
+ game/g_vis.cpp \
\
- game/lua/lapi.c \
- game/lua/lauxlib.c \
- game/lua/lbaselib.c \
- game/lua/lcode.c \
- game/lua/ldblib.c \
- game/lua/ldebug.c \
- game/lua/ldo.c \
- game/lua/ldump.c \
- game/lua/lfunc.c \
- game/lua/lgc.c \
- game/lua/linit.c \
- game/lua/liolib.c \
- game/lua/llex.c \
- game/lua/lmathlib.c \
- game/lua/lmem.c \
- game/lua/loadlib.c \
- game/lua/lobject.c \
- game/lua/lopcodes.c \
- game/lua/loslib.c \
- game/lua/lparser.c \
- game/lua/lstate.c \
- game/lua/lstring.c \
- game/lua/lstrlib.c \
- game/lua/ltable.c \
- game/lua/ltablib.c \
- game/lua/ltm.c \
- game/lua/lundump.c \
- game/lua/lvm.c \
- game/lua/lzio.c \
- game/lua/print.c
+ game/lua/lapi.cpp \
+ game/lua/lauxlib.cpp \
+ game/lua/lbaselib.cpp \
+ game/lua/lcode.cpp \
+ game/lua/ldblib.cpp \
+ game/lua/ldebug.cpp \
+ game/lua/ldo.cpp \
+ game/lua/ldump.cpp \
+ game/lua/lfunc.cpp \
+ game/lua/lgc.cpp \
+ game/lua/linit.cpp \
+ game/lua/liolib.cpp \
+ game/lua/llex.cpp \
+ game/lua/lmathlib.cpp \
+ game/lua/lmem.cpp \
+ game/lua/loadlib.cpp \
+ game/lua/lobject.cpp \
+ game/lua/lopcodes.cpp \
+ game/lua/loslib.cpp \
+ game/lua/lparser.cpp \
+ game/lua/lstate.cpp \
+ game/lua/lstring.cpp \
+ game/lua/lstrlib.cpp \
+ game/lua/ltable.cpp \
+ game/lua/ltablib.cpp \
+ game/lua/ltm.cpp \
+ game/lua/lundump.cpp \
+ game/lua/lvm.cpp \
+ game/lua/lzio.cpp \
+ game/lua/print.cpp
ifneq ($(HARD_LINKED_GAME),1)
- $(TARGET)_SRCS += shared/mathlib.c \
- shared/shared.c \
- shared/utf8.c \
- shared/parse.c \
- shared/infostring.c \
+ $(TARGET)_SRCS += shared/mathlib.cpp \
+ shared/shared.cpp \
+ shared/utf8.cpp \
+ shared/parse.cpp \
+ shared/infostring.cpp \
\
- game/q_shared.c \
- game/chr_shared.c \
- game/inv_shared.c \
- game/inventory.c
+ game/q_shared.cpp \
+ game/chr_shared.cpp \
+ game/inv_shared.cpp \
+ game/inventory.cpp
else
$(TARGET)_IGNORE := yes
endif
diff --git a/build/modules/memory.mk b/build/modules/memory.mk
index 1fb641c4ae0..9b6315feff8 100644
--- a/build/modules/memory.mk
+++ b/build/modules/memory.mk
@@ -12,7 +12,7 @@ $(TARGET)_LDFLAGS += -lm
$(TARGET)_CFLAGS += -DCOMPILE_UFO $(SDL_CFLAGS) $(SDL_IMAGE_CFLAGS) $(MXML_CFLAGS)
$(TARGET)_SRCS = \
- tools/memory.c
+ tools/memory.cpp
$(TARGET)_OBJS := $(call ASSEMBLE_OBJECTS,$(TARGET))
$(TARGET)_CXXFLAGS := $($(TARGET)_CFLAGS)
diff --git a/build/modules/testall.mk b/build/modules/testall.mk
index 08f639a4084..d91251eed74 100644
--- a/build/modules/testall.mk
+++ b/build/modules/testall.mk
@@ -12,256 +12,256 @@ $(TARGET)_CFLAGS += -DCOMPILE_UFO -DHARD_LINKED_GAME -DCOMPILE_UNITTESTS $(BFD
$(TARGET)_LDFLAGS += -lcunit -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz
$(TARGET)_SRCS = \
- tests/test_all.c \
- tests/test_routing.c \
- tests/test_events.c \
- tests/test_generic.c \
- tests/test_inventory.c \
- tests/test_game.c \
- tests/test_mapdef.c \
- tests/test_mathlibextra.c \
- tests/test_rma.c \
- tests/test_renderer.c \
- tests/test_scripts.c \
- tests/test_shared.c \
- tests/test_ui.c \
- tests/test_ui_level2.c \
- tests/test_campaign.c \
- tests/test_parser.c \
- tests/test_dbuffer.c \
+ tests/test_all.cpp \
+ tests/test_routing.cpp \
+ tests/test_events.cpp \
+ tests/test_generic.cpp \
+ tests/test_inventory.cpp \
+ tests/test_game.cpp \
+ tests/test_mapdef.cpp \
+ tests/test_mathlibextra.cpp \
+ tests/test_rma.cpp \
+ tests/test_renderer.cpp \
+ tests/test_scripts.cpp \
+ tests/test_shared.cpp \
+ tests/test_ui.cpp \
+ tests/test_ui_level2.cpp \
+ tests/test_campaign.cpp \
+ tests/test_parser.cpp \
+ tests/test_dbuffer.cpp \
\
- client/cl_console.c \
- client/cl_http.c \
- client/cl_inventory.c \
- client/cl_inventory_callbacks.c \
- client/cl_irc.c \
- client/cl_language.c \
- client/cl_main.c \
- client/cl_menu.c \
- client/cl_screen.c \
- client/cl_team.c \
- client/cl_tip.c \
- client/cl_tutorials.c \
- client/cl_video.c \
+ client/cl_console.cpp \
+ client/cl_http.cpp \
+ client/cl_inventory.cpp \
+ client/cl_inventory_callbacks.cpp \
+ client/cl_irc.cpp \
+ client/cl_language.cpp \
+ client/cl_main.cpp \
+ client/cl_menu.cpp \
+ client/cl_screen.cpp \
+ client/cl_team.cpp \
+ client/cl_tip.cpp \
+ client/cl_tutorials.cpp \
+ client/cl_video.cpp \
\
- client/input/cl_input.c \
- client/input/cl_joystick.c \
- client/input/cl_keys.c \
+ client/input/cl_input.cpp \
+ client/input/cl_joystick.cpp \
+ client/input/cl_keys.cpp \
\
- client/cinematic/cl_cinematic.c \
- client/cinematic/cl_cinematic_roq.c \
- client/cinematic/cl_cinematic_ogm.c \
- client/cinematic/cl_sequence.c \
+ client/cinematic/cl_cinematic.cpp \
+ client/cinematic/cl_cinematic_roq.cpp \
+ client/cinematic/cl_cinematic_ogm.cpp \
+ client/cinematic/cl_sequence.cpp \
\
- client/battlescape/cl_actor.c \
- client/battlescape/cl_battlescape.c \
- client/battlescape/cl_camera.c \
- client/battlescape/cl_hud.c \
- client/battlescape/cl_hud_callbacks.c \
- client/battlescape/cl_localentity.c \
- client/battlescape/cl_parse.c \
- client/battlescape/cl_particle.c \
- client/battlescape/cl_radar.c \
- client/battlescape/cl_ugv.c \
- client/battlescape/cl_view.c \
- client/battlescape/cl_spawn.c \
+ client/battlescape/cl_actor.cpp \
+ client/battlescape/cl_battlescape.cpp \
+ client/battlescape/cl_camera.cpp \
+ client/battlescape/cl_hud.cpp \
+ client/battlescape/cl_hud_callbacks.cpp \
+ client/battlescape/cl_localentity.cpp \
+ client/battlescape/cl_parse.cpp \
+ client/battlescape/cl_particle.cpp \
+ client/battlescape/cl_radar.cpp \
+ client/battlescape/cl_ugv.cpp \
+ client/battlescape/cl_view.cpp \
+ client/battlescape/cl_spawn.cpp \
\
- client/battlescape/events/e_main.c \
- client/battlescape/events/e_parse.c \
- client/battlescape/events/e_server.c \
- client/battlescape/events/event/actor/e_event_actoradd.c \
- client/battlescape/events/event/actor/e_event_actorappear.c \
- client/battlescape/events/event/actor/e_event_actorclientaction.c \
- client/battlescape/events/event/actor/e_event_actordie.c \
- client/battlescape/events/event/actor/e_event_actormove.c \
- client/battlescape/events/event/actor/e_event_actorresetclientaction.c \
- client/battlescape/events/event/actor/e_event_actorreservationchange.c \
- client/battlescape/events/event/actor/e_event_actorreactionfirechange.c \
- client/battlescape/events/event/actor/e_event_actorrevitalised.c \
- client/battlescape/events/event/actor/e_event_actorshoot.c \
- client/battlescape/events/event/actor/e_event_actorshoothidden.c \
- client/battlescape/events/event/actor/e_event_actorstartshoot.c \
- client/battlescape/events/event/actor/e_event_actorstatechange.c \
- client/battlescape/events/event/actor/e_event_actorstats.c \
- client/battlescape/events/event/actor/e_event_actorthrow.c \
- client/battlescape/events/event/actor/e_event_actorturn.c \
- client/battlescape/events/event/inventory/e_event_invadd.c \
- client/battlescape/events/event/inventory/e_event_invammo.c \
- client/battlescape/events/event/inventory/e_event_invdel.c \
- client/battlescape/events/event/inventory/e_event_invreload.c \
- client/battlescape/events/event/player/e_event_centerview.c \
- client/battlescape/events/event/player/e_event_doendround.c \
- client/battlescape/events/event/player/e_event_endroundannounce.c \
- client/battlescape/events/event/player/e_event_reset.c \
- client/battlescape/events/event/player/e_event_results.c \
- client/battlescape/events/event/player/e_event_startgame.c \
- client/battlescape/events/event/world/e_event_addbrushmodel.c \
- client/battlescape/events/event/world/e_event_addedict.c \
- client/battlescape/events/event/world/e_event_doorclose.c \
- client/battlescape/events/event/world/e_event_dooropen.c \
- client/battlescape/events/event/world/e_event_entappear.c \
- client/battlescape/events/event/world/e_event_entdestroy.c \
- client/battlescape/events/event/world/e_event_entperish.c \
- client/battlescape/events/event/world/e_event_explode.c \
- client/battlescape/events/event/world/e_event_particleappear.c \
- client/battlescape/events/event/world/e_event_particlespawn.c \
- client/battlescape/events/event/world/e_event_sound.c \
+ client/battlescape/events/e_main.cpp \
+ client/battlescape/events/e_parse.cpp \
+ client/battlescape/events/e_server.cpp \
+ client/battlescape/events/event/actor/e_event_actoradd.cpp \
+ client/battlescape/events/event/actor/e_event_actorappear.cpp \
+ client/battlescape/events/event/actor/e_event_actorclientaction.cpp \
+ client/battlescape/events/event/actor/e_event_actordie.cpp \
+ client/battlescape/events/event/actor/e_event_actormove.cpp \
+ client/battlescape/events/event/actor/e_event_actorresetclientaction.cpp \
+ client/battlescape/events/event/actor/e_event_actorreservationchange.cpp \
+ client/battlescape/events/event/actor/e_event_actorreactionfirechange.cpp \
+ client/battlescape/events/event/actor/e_event_actorrevitalised.cpp \
+ client/battlescape/events/event/actor/e_event_actorshoot.cpp \
+ client/battlescape/events/event/actor/e_event_actorshoothidden.cpp \
+ client/battlescape/events/event/actor/e_event_actorstartshoot.cpp \
+ client/battlescape/events/event/actor/e_event_actorstatechange.cpp \
+ client/battlescape/events/event/actor/e_event_actorstats.cpp \
+ client/battlescape/events/event/actor/e_event_actorthrow.cpp \
+ client/battlescape/events/event/actor/e_event_actorturn.cpp \
+ client/battlescape/events/event/inventory/e_event_invadd.cpp \
+ client/battlescape/events/event/inventory/e_event_invammo.cpp \
+ client/battlescape/events/event/inventory/e_event_invdel.cpp \
+ client/battlescape/events/event/inventory/e_event_invreload.cpp \
+ client/battlescape/events/event/player/e_event_centerview.cpp \
+ client/battlescape/events/event/player/e_event_doendround.cpp \
+ client/battlescape/events/event/player/e_event_endroundannounce.cpp \
+ client/battlescape/events/event/player/e_event_reset.cpp \
+ client/battlescape/events/event/player/e_event_results.cpp \
+ client/battlescape/events/event/player/e_event_startgame.cpp \
+ client/battlescape/events/event/world/e_event_addbrushmodel.cpp \
+ client/battlescape/events/event/world/e_event_addedict.cpp \
+ client/battlescape/events/event/world/e_event_doorclose.cpp \
+ client/battlescape/events/event/world/e_event_dooropen.cpp \
+ client/battlescape/events/event/world/e_event_entappear.cpp \
+ client/battlescape/events/event/world/e_event_entdestroy.cpp \
+ client/battlescape/events/event/world/e_event_entperish.cpp \
+ client/battlescape/events/event/world/e_event_explode.cpp \
+ client/battlescape/events/event/world/e_event_particleappear.cpp \
+ client/battlescape/events/event/world/e_event_particlespawn.cpp \
+ client/battlescape/events/event/world/e_event_sound.cpp \
\
- client/sound/s_music.c \
- client/sound/s_main.c \
- client/sound/s_mix.c \
- client/sound/s_sample.c \
+ client/sound/s_music.cpp \
+ client/sound/s_main.cpp \
+ client/sound/s_mix.cpp \
+ client/sound/s_sample.cpp \
\
- client/cgame/cl_game.c \
- client/cgame/cl_game_team.c \
+ client/cgame/cl_game.cpp \
+ client/cgame/cl_game_team.cpp \
\
- client/ui/ui_actions.c \
- client/ui/ui_behaviour.c \
- client/ui/ui_components.c \
- client/ui/ui_data.c \
- client/ui/ui_dragndrop.c \
- client/ui/ui_draw.c \
- client/ui/ui_expression.c \
- client/ui/ui_font.c \
- client/ui/ui_sprite.c \
- client/ui/ui_input.c \
- client/ui/ui_main.c \
+ client/ui/ui_actions.cpp \
+ client/ui/ui_behaviour.cpp \
+ client/ui/ui_components.cpp \
+ client/ui/ui_data.cpp \
+ client/ui/ui_dragndrop.cpp \
+ client/ui/ui_draw.cpp \
+ client/ui/ui_expression.cpp \
+ client/ui/ui_font.cpp \
+ client/ui/ui_sprite.cpp \
+ client/ui/ui_input.cpp \
+ client/ui/ui_main.cpp \
client/ui/ui_node.cpp \
- client/ui/ui_nodes.c \
- client/ui/ui_parse.c \
- client/ui/ui_popup.c \
- client/ui/ui_render.c \
- client/ui/ui_sound.c \
- client/ui/ui_timer.c \
- client/ui/ui_tooltip.c \
- client/ui/ui_windows.c \
+ client/ui/ui_nodes.cpp \
+ client/ui/ui_parse.cpp \
+ client/ui/ui_popup.cpp \
+ client/ui/ui_render.cpp \
+ client/ui/ui_sound.cpp \
+ client/ui/ui_timer.cpp \
+ client/ui/ui_tooltip.cpp \
+ client/ui/ui_windows.cpp \
client/ui/node/ui_node_abstractnode.cpp \
- client/ui/node/ui_node_abstractvalue.c \
- client/ui/node/ui_node_abstractoption.c \
- client/ui/node/ui_node_abstractscrollbar.c \
- client/ui/node/ui_node_abstractscrollable.c \
- client/ui/node/ui_node_bar.c \
- client/ui/node/ui_node_base.c \
- client/ui/node/ui_node_baseinventory.c \
- client/ui/node/ui_node_battlescape.c \
- client/ui/node/ui_node_button.c \
- client/ui/node/ui_node_checkbox.c \
- client/ui/node/ui_node_video.c \
- client/ui/node/ui_node_container.c \
- client/ui/node/ui_node_controls.c \
- client/ui/node/ui_node_custombutton.c \
- client/ui/node/ui_node_data.c \
- client/ui/node/ui_node_editor.c \
- client/ui/node/ui_node_ekg.c \
- client/ui/node/ui_node_image.c \
- client/ui/node/ui_node_item.c \
- client/ui/node/ui_node_keybinding.c \
- client/ui/node/ui_node_linechart.c \
- client/ui/node/ui_node_map.c \
- client/ui/node/ui_node_material_editor.c \
- client/ui/node/ui_node_model.c \
- client/ui/node/ui_node_messagelist.c \
- client/ui/node/ui_node_option.c \
- client/ui/node/ui_node_optionlist.c \
- client/ui/node/ui_node_optiontree.c \
- client/ui/node/ui_node_panel.c \
- client/ui/node/ui_node_radar.c \
- client/ui/node/ui_node_radiobutton.c \
- client/ui/node/ui_node_rows.c \
- client/ui/node/ui_node_selectbox.c \
- client/ui/node/ui_node_sequence.c \
- client/ui/node/ui_node_string.c \
- client/ui/node/ui_node_special.c \
- client/ui/node/ui_node_spinner.c \
- client/ui/node/ui_node_spinner2.c \
- client/ui/node/ui_node_tab.c \
- client/ui/node/ui_node_tbar.c \
- client/ui/node/ui_node_text.c \
- client/ui/node/ui_node_text2.c \
- client/ui/node/ui_node_textlist.c \
- client/ui/node/ui_node_textentry.c \
- client/ui/node/ui_node_texture.c \
- client/ui/node/ui_node_todo.c \
- client/ui/node/ui_node_vscrollbar.c \
- client/ui/node/ui_node_window.c \
- client/ui/node/ui_node_zone.c \
+ client/ui/node/ui_node_abstractvalue.cpp \
+ client/ui/node/ui_node_abstractoption.cpp \
+ client/ui/node/ui_node_abstractscrollbar.cpp \
+ client/ui/node/ui_node_abstractscrollable.cpp \
+ client/ui/node/ui_node_bar.cpp \
+ client/ui/node/ui_node_base.cpp \
+ client/ui/node/ui_node_baseinventory.cpp \
+ client/ui/node/ui_node_battlescape.cpp \
+ client/ui/node/ui_node_button.cpp \
+ client/ui/node/ui_node_checkbox.cpp \
+ client/ui/node/ui_node_video.cpp \
+ client/ui/node/ui_node_container.cpp \
+ client/ui/node/ui_node_controls.cpp \
+ client/ui/node/ui_node_custombutton.cpp \
+ client/ui/node/ui_node_data.cpp \
+ client/ui/node/ui_node_editor.cpp \
+ client/ui/node/ui_node_ekg.cpp \
+ client/ui/node/ui_node_image.cpp \
+ client/ui/node/ui_node_item.cpp \
+ client/ui/node/ui_node_keybinding.cpp \
+ client/ui/node/ui_node_linechart.cpp \
+ client/ui/node/ui_node_map.cpp \
+ client/ui/node/ui_node_material_editor.cpp \
+ client/ui/node/ui_node_model.cpp \
+ client/ui/node/ui_node_messagelist.cpp \
+ client/ui/node/ui_node_option.cpp \
+ client/ui/node/ui_node_optionlist.cpp \
+ client/ui/node/ui_node_optiontree.cpp \
+ client/ui/node/ui_node_panel.cpp \
+ client/ui/node/ui_node_radar.cpp \
+ client/ui/node/ui_node_radiobutton.cpp \
+ client/ui/node/ui_node_rows.cpp \
+ client/ui/node/ui_node_selectbox.cpp \
+ client/ui/node/ui_node_sequence.cpp \
+ client/ui/node/ui_node_string.cpp \
+ client/ui/node/ui_node_special.cpp \
+ client/ui/node/ui_node_spinner.cpp \
+ client/ui/node/ui_node_spinner2.cpp \
+ client/ui/node/ui_node_tab.cpp \
+ client/ui/node/ui_node_tbar.cpp \
+ client/ui/node/ui_node_text.cpp \
+ client/ui/node/ui_node_text2.cpp \
+ client/ui/node/ui_node_textlist.cpp \
+ client/ui/node/ui_node_textentry.cpp \
+ client/ui/node/ui_node_texture.cpp \
+ client/ui/node/ui_node_todo.cpp \
+ client/ui/node/ui_node_vscrollbar.cpp \
+ client/ui/node/ui_node_window.cpp \
+ client/ui/node/ui_node_zone.cpp \
\
- common/binaryexpressionparser.c \
- common/cmd.c \
- common/http.c \
- common/ioapi.c \
- common/unzip.c \
- common/bsp.c \
- common/grid.c \
- common/cmodel.c \
- common/common.c \
- common/cvar.c \
- common/files.c \
- common/list.c \
- common/md4.c \
- common/md5.c \
- common/mem.c \
- common/msg.c \
- common/net.c \
- common/netpack.c \
- common/dbuffer.c \
- common/pqueue.c \
- common/scripts.c \
- common/tracing.c \
- common/routing.c \
- common/xml.c \
+ common/binaryexpressionparser.cpp \
+ common/cmd.cpp \
+ common/http.cpp \
+ common/ioapi.cpp \
+ common/unzip.cpp \
+ common/bsp.cpp \
+ common/grid.cpp \
+ common/cmodel.cpp \
+ common/common.cpp \
+ common/cvar.cpp \
+ common/files.cpp \
+ common/list.cpp \
+ common/md4.cpp \
+ common/md5.cpp \
+ common/mem.cpp \
+ common/msg.cpp \
+ common/net.cpp \
+ common/netpack.cpp \
+ common/dbuffer.cpp \
+ common/pqueue.cpp \
+ common/scripts.cpp \
+ common/tracing.cpp \
+ common/routing.cpp \
+ common/xml.cpp \
\
- server/sv_ccmds.c \
- server/sv_game.c \
- server/sv_init.c \
- server/sv_log.c \
- server/sv_main.c \
- server/sv_mapcycle.c \
- server/sv_rma.c \
- server/sv_send.c \
- server/sv_user.c \
- server/sv_world.c \
+ server/sv_ccmds.cpp \
+ server/sv_game.cpp \
+ server/sv_init.cpp \
+ server/sv_log.cpp \
+ server/sv_main.cpp \
+ server/sv_mapcycle.cpp \
+ server/sv_rma.cpp \
+ server/sv_send.cpp \
+ server/sv_user.cpp \
+ server/sv_world.cpp \
\
- client/renderer/r_array.c \
- client/renderer/r_bsp.c \
- client/renderer/r_draw.c \
- client/renderer/r_corona.c \
- client/renderer/r_entity.c \
- client/renderer/r_font.c \
- client/renderer/r_flare.c \
- client/renderer/r_framebuffer.c \
- client/renderer/r_geoscape.c \
- client/renderer/r_image.c \
- client/renderer/r_light.c \
- client/renderer/r_lightmap.c \
- client/renderer/r_main.c \
- client/renderer/r_material.c \
- client/renderer/r_matrix.c \
- client/renderer/r_misc.c \
- client/renderer/r_mesh.c \
- client/renderer/r_mesh_anim.c \
- client/renderer/r_model.c \
- client/renderer/r_model_alias.c \
- client/renderer/r_model_brush.c \
- client/renderer/r_model_dpm.c \
- client/renderer/r_model_md2.c \
- client/renderer/r_model_md3.c \
- client/renderer/r_model_obj.c \
- client/renderer/r_particle.c \
- client/renderer/r_program.c \
- client/renderer/r_sdl.c \
- client/renderer/r_surface.c \
- client/renderer/r_state.c \
- client/renderer/r_sphere.c \
- client/renderer/r_thread.c \
+ client/renderer/r_array.cpp \
+ client/renderer/r_bsp.cpp \
+ client/renderer/r_draw.cpp \
+ client/renderer/r_corona.cpp \
+ client/renderer/r_entity.cpp \
+ client/renderer/r_font.cpp \
+ client/renderer/r_flare.cpp \
+ client/renderer/r_framebuffer.cpp \
+ client/renderer/r_geoscape.cpp \
+ client/renderer/r_image.cpp \
+ client/renderer/r_light.cpp \
+ client/renderer/r_lightmap.cpp \
+ client/renderer/r_main.cpp \
+ client/renderer/r_material.cpp \
+ client/renderer/r_matrix.cpp \
+ client/renderer/r_misc.cpp \
+ client/renderer/r_mesh.cpp \
+ client/renderer/r_mesh_anim.cpp \
+ client/renderer/r_model.cpp \
+ client/renderer/r_model_alias.cpp \
+ client/renderer/r_model_brush.cpp \
+ client/renderer/r_model_dpm.cpp \
+ client/renderer/r_model_md2.cpp \
+ client/renderer/r_model_md3.cpp \
+ client/renderer/r_model_obj.cpp \
+ client/renderer/r_particle.cpp \
+ client/renderer/r_program.cpp \
+ client/renderer/r_sdl.cpp \
+ client/renderer/r_surface.cpp \
+ client/renderer/r_state.cpp \
+ client/renderer/r_sphere.cpp \
+ client/renderer/r_thread.cpp \
\
- shared/mathlib_extra.c \
- shared/bfd.c \
- shared/entitiesdef.c \
- shared/stringhunk.c \
- shared/byte.c \
- shared/mutex.c \
- shared/images.c \
+ shared/mathlib_extra.cpp \
+ shared/bfd.cpp \
+ shared/entitiesdef.cpp \
+ shared/stringhunk.cpp \
+ shared/byte.cpp \
+ shared/mutex.cpp \
+ shared/images.cpp \
\
$(game_SRCS) \
\
@@ -269,29 +269,29 @@ $(TARGET)_SRCS = \
ifeq ($(TARGET_OS),mingw32)
$(TARGET)_SRCS += \
- ports/windows/win_backtrace.c \
- ports/windows/win_console.c \
- ports/windows/win_shared.c \
+ ports/windows/win_backtrace.cpp \
+ ports/windows/win_console.cpp \
+ ports/windows/win_shared.cpp \
ports/windows/ufo.rc
else
$(TARGET)_SRCS += \
- ports/unix/unix_console.c \
- ports/unix/unix_files.c \
- ports/unix/unix_shared.c \
- ports/unix/unix_main.c
+ ports/unix/unix_console.cpp \
+ ports/unix/unix_files.cpp \
+ ports/unix/unix_shared.cpp \
+ ports/unix/unix_main.cpp
endif
ifeq ($(HARD_LINKED_GAME),1)
- $(TARGET)_SRCS += shared/mathlib.c \
- shared/shared.c \
- shared/utf8.c \
- shared/parse.c \
- shared/infostring.c \
+ $(TARGET)_SRCS += shared/mathlib.cpp \
+ shared/shared.cpp \
+ shared/utf8.cpp \
+ shared/parse.cpp \
+ shared/infostring.cpp \
\
- game/q_shared.c \
- game/chr_shared.c \
- game/inv_shared.c \
- game/inventory.c
+ game/q_shared.cpp \
+ game/chr_shared.cpp \
+ game/inv_shared.cpp \
+ game/inventory.cpp
endif
ifeq ($(HARD_LINKED_CGAME),1)
diff --git a/build/modules/ufo.mk b/build/modules/ufo.mk
index 5159277ee5f..78d33685a19 100644
--- a/build/modules/ufo.mk
+++ b/build/modules/ufo.mk
@@ -12,266 +12,266 @@ $(TARGET)_CFLAGS += -DCOMPILE_UFO $(BFD_CFLAGS) $(SDL_CFLAGS) $(SDL_TTF_CFLAGS
$(TARGET)_LDFLAGS += -lpng -ljpeg $(BFD_LIBS) $(INTL_LIBS) $(SDL_TTF_LIBS) $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) $(OPENGL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(THEORA_LIBS) $(XVID_LIBS) $(VORBIS_LIBS) $(OGG_LIBS) $(MXML_LIBS) $(SO_LIBS) -lz
$(TARGET)_SRCS = \
- client/cl_console.c \
- client/cl_http.c \
- client/cl_inventory.c \
- client/cl_inventory_callbacks.c \
- client/cl_irc.c \
- client/cl_language.c \
- client/cl_main.c \
- client/cl_menu.c \
- client/cl_screen.c \
- client/cl_team.c \
- client/cl_tip.c \
- client/cl_tutorials.c \
- client/cl_video.c \
+ client/cl_console.cpp \
+ client/cl_http.cpp \
+ client/cl_inventory.cpp \
+ client/cl_inventory_callbacks.cpp \
+ client/cl_irc.cpp \
+ client/cl_language.cpp \
+ client/cl_main.cpp \
+ client/cl_menu.cpp \
+ client/cl_screen.cpp \
+ client/cl_team.cpp \
+ client/cl_tip.cpp \
+ client/cl_tutorials.cpp \
+ client/cl_video.cpp \
\
- client/input/cl_input.c \
- client/input/cl_joystick.c \
- client/input/cl_keys.c \
+ client/input/cl_input.cpp \
+ client/input/cl_joystick.cpp \
+ client/input/cl_keys.cpp \
\
- client/cinematic/cl_cinematic.c \
- client/cinematic/cl_cinematic_roq.c \
- client/cinematic/cl_cinematic_ogm.c \
- client/cinematic/cl_sequence.c \
+ client/cinematic/cl_cinematic.cpp \
+ client/cinematic/cl_cinematic_roq.cpp \
+ client/cinematic/cl_cinematic_ogm.cpp \
+ client/cinematic/cl_sequence.cpp \
\
- client/battlescape/cl_actor.c \
- client/battlescape/cl_battlescape.c \
- client/battlescape/cl_camera.c \
- client/battlescape/cl_hud.c \
- client/battlescape/cl_hud_callbacks.c \
- client/battlescape/cl_localentity.c \
- client/battlescape/cl_parse.c \
- client/battlescape/cl_particle.c \
- client/battlescape/cl_radar.c \
- client/battlescape/cl_ugv.c \
- client/battlescape/cl_view.c \
- client/battlescape/cl_spawn.c \
+ client/battlescape/cl_actor.cpp \
+ client/battlescape/cl_battlescape.cpp \
+ client/battlescape/cl_camera.cpp \
+ client/battlescape/cl_hud.cpp \
+ client/battlescape/cl_hud_callbacks.cpp \
+ client/battlescape/cl_localentity.cpp \
+ client/battlescape/cl_parse.cpp \
+ client/battlescape/cl_particle.cpp \
+ client/battlescape/cl_radar.cpp \
+ client/battlescape/cl_ugv.cpp \
+ client/battlescape/cl_view.cpp \
+ client/battlescape/cl_spawn.cpp \
\
- client/battlescape/events/e_main.c \
- client/battlescape/events/e_parse.c \
- client/battlescape/events/e_server.c \
- client/battlescape/events/event/actor/e_event_actoradd.c \
- client/battlescape/events/event/actor/e_event_actorappear.c \
- client/battlescape/events/event/actor/e_event_actorclientaction.c \
- client/battlescape/events/event/actor/e_event_actordie.c \
- client/battlescape/events/event/actor/e_event_actormove.c \
- client/battlescape/events/event/actor/e_event_actorresetclientaction.c \
- client/battlescape/events/event/actor/e_event_actorreservationchange.c \
- client/battlescape/events/event/actor/e_event_actorreactionfirechange.c \
- client/battlescape/events/event/actor/e_event_actorrevitalised.c \
- client/battlescape/events/event/actor/e_event_actorshoot.c \
- client/battlescape/events/event/actor/e_event_actorshoothidden.c \
- client/battlescape/events/event/actor/e_event_actorstartshoot.c \
- client/battlescape/events/event/actor/e_event_actorstatechange.c \
- client/battlescape/events/event/actor/e_event_actorstats.c \
- client/battlescape/events/event/actor/e_event_actorthrow.c \
- client/battlescape/events/event/actor/e_event_actorturn.c \
- client/battlescape/events/event/inventory/e_event_invadd.c \
- client/battlescape/events/event/inventory/e_event_invammo.c \
- client/battlescape/events/event/inventory/e_event_invdel.c \
- client/battlescape/events/event/inventory/e_event_invreload.c \
- client/battlescape/events/event/player/e_event_centerview.c \
- client/battlescape/events/event/player/e_event_doendround.c \
- client/battlescape/events/event/player/e_event_endroundannounce.c \
- client/battlescape/events/event/player/e_event_reset.c \
- client/battlescape/events/event/player/e_event_results.c \
- client/battlescape/events/event/player/e_event_startgame.c \
- client/battlescape/events/event/world/e_event_addbrushmodel.c \
- client/battlescape/events/event/world/e_event_addedict.c \
- client/battlescape/events/event/world/e_event_doorclose.c \
- client/battlescape/events/event/world/e_event_dooropen.c \
- client/battlescape/events/event/world/e_event_entappear.c \
- client/battlescape/events/event/world/e_event_entdestroy.c \
- client/battlescape/events/event/world/e_event_entperish.c \
- client/battlescape/events/event/world/e_event_explode.c \
- client/battlescape/events/event/world/e_event_particleappear.c \
- client/battlescape/events/event/world/e_event_particlespawn.c \
- client/battlescape/events/event/world/e_event_sound.c \
+ client/battlescape/events/e_main.cpp \
+ client/battlescape/events/e_parse.cpp \
+ client/battlescape/events/e_server.cpp \
+ client/battlescape/events/event/actor/e_event_actoradd.cpp \
+ client/battlescape/events/event/actor/e_event_actorappear.cpp \
+ client/battlescape/events/event/actor/e_event_actorclientaction.cpp \
+ client/battlescape/events/event/actor/e_event_actordie.cpp \
+ client/battlescape/events/event/actor/e_event_actormove.cpp \
+ client/battlescape/events/event/actor/e_event_actorresetclientaction.cpp \
+ client/battlescape/events/event/actor/e_event_actorreservationchange.cpp \
+ client/battlescape/events/event/actor/e_event_actorreactionfirechange.cpp \
+ client/battlescape/events/event/actor/e_event_actorrevitalised.cpp \
+ client/battlescape/events/event/actor/e_event_actorshoot.cpp \
+ client/battlescape/events/event/actor/e_event_actorshoothidden.cpp \
+ client/battlescape/events/event/actor/e_event_actorstartshoot.cpp \
+ client/battlescape/events/event/actor/e_event_actorstatechange.cpp \
+ client/battlescape/events/event/actor/e_event_actorstats.cpp \
+ client/battlescape/events/event/actor/e_event_actorthrow.cpp \
+ client/battlescape/events/event/actor/e_event_actorturn.cpp \
+ client/battlescape/events/event/inventory/e_event_invadd.cpp \
+ client/battlescape/events/event/inventory/e_event_invammo.cpp \
+ client/battlescape/events/event/inventory/e_event_invdel.cpp \
+ client/battlescape/events/event/inventory/e_event_invreload.cpp \
+ client/battlescape/events/event/player/e_event_centerview.cpp \
+ client/battlescape/events/event/player/e_event_doendround.cpp \
+ client/battlescape/events/event/player/e_event_endroundannounce.cpp \
+ client/battlescape/events/event/player/e_event_reset.cpp \
+ client/battlescape/events/event/player/e_event_results.cpp \
+ client/battlescape/events/event/player/e_event_startgame.cpp \
+ client/battlescape/events/event/world/e_event_addbrushmodel.cpp \
+ client/battlescape/events/event/world/e_event_addedict.cpp \
+ client/battlescape/events/event/world/e_event_doorclose.cpp \
+ client/battlescape/events/event/world/e_event_dooropen.cpp \
+ client/battlescape/events/event/world/e_event_entappear.cpp \
+ client/battlescape/events/event/world/e_event_entdestroy.cpp \
+ client/battlescape/events/event/world/e_event_entperish.cpp \
+ client/battlescape/events/event/world/e_event_explode.cpp \
+ client/battlescape/events/event/world/e_event_particleappear.cpp \
+ client/battlescape/events/event/world/e_event_particlespawn.cpp \
+ client/battlescape/events/event/world/e_event_sound.cpp \
\
- client/sound/s_music.c \
- client/sound/s_main.c \
- client/sound/s_mix.c \
- client/sound/s_sample.c \
+ client/sound/s_music.cpp \
+ client/sound/s_main.cpp \
+ client/sound/s_mix.cpp \
+ client/sound/s_sample.cpp \
\
- client/cgame/cl_game.c \
- client/cgame/cl_game_team.c \
+ client/cgame/cl_game.cpp \
+ client/cgame/cl_game_team.cpp \
\
- client/ui/ui_actions.c \
- client/ui/ui_behaviour.c \
- client/ui/ui_components.c \
- client/ui/ui_data.c \
- client/ui/ui_dragndrop.c \
- client/ui/ui_draw.c \
- client/ui/ui_expression.c \
- client/ui/ui_font.c \
- client/ui/ui_sprite.c \
- client/ui/ui_input.c \
- client/ui/ui_main.c \
+ client/ui/ui_actions.cpp \
+ client/ui/ui_behaviour.cpp \
+ client/ui/ui_components.cpp \
+ client/ui/ui_data.cpp \
+ client/ui/ui_dragndrop.cpp \
+ client/ui/ui_draw.cpp \
+ client/ui/ui_expression.cpp \
+ client/ui/ui_font.cpp \
+ client/ui/ui_sprite.cpp \
+ client/ui/ui_input.cpp \
+ client/ui/ui_main.cpp \
client/ui/ui_node.cpp \
- client/ui/ui_nodes.c \
- client/ui/ui_parse.c \
- client/ui/ui_popup.c \
- client/ui/ui_render.c \
- client/ui/ui_sound.c \
- client/ui/ui_timer.c \
- client/ui/ui_tooltip.c \
- client/ui/ui_windows.c \
+ client/ui/ui_nodes.cpp \
+ client/ui/ui_parse.cpp \
+ client/ui/ui_popup.cpp \
+ client/ui/ui_render.cpp \
+ client/ui/ui_sound.cpp \
+ client/ui/ui_timer.cpp \
+ client/ui/ui_tooltip.cpp \
+ client/ui/ui_windows.cpp \
client/ui/node/ui_node_abstractnode.cpp \
- client/ui/node/ui_node_abstractvalue.c \
- client/ui/node/ui_node_abstractoption.c \
- client/ui/node/ui_node_abstractscrollbar.c \
- client/ui/node/ui_node_abstractscrollable.c \
- client/ui/node/ui_node_bar.c \
- client/ui/node/ui_node_base.c \
- client/ui/node/ui_node_baseinventory.c \
- client/ui/node/ui_node_battlescape.c \
- client/ui/node/ui_node_button.c \
- client/ui/node/ui_node_checkbox.c \
- client/ui/node/ui_node_data.c \
- client/ui/node/ui_node_video.c \
- client/ui/node/ui_node_container.c \
- client/ui/node/ui_node_controls.c \
- client/ui/node/ui_node_custombutton.c \
- client/ui/node/ui_node_editor.c \
- client/ui/node/ui_node_ekg.c \
- client/ui/node/ui_node_image.c \
- client/ui/node/ui_node_item.c \
- client/ui/node/ui_node_keybinding.c \
- client/ui/node/ui_node_linechart.c \
- client/ui/node/ui_node_map.c \
- client/ui/node/ui_node_material_editor.c \
- client/ui/node/ui_node_model.c \
- client/ui/node/ui_node_messagelist.c \
- client/ui/node/ui_node_option.c \
- client/ui/node/ui_node_optionlist.c \
- client/ui/node/ui_node_optiontree.c \
- client/ui/node/ui_node_panel.c \
- client/ui/node/ui_node_radar.c \
- client/ui/node/ui_node_radiobutton.c \
- client/ui/node/ui_node_rows.c \
- client/ui/node/ui_node_selectbox.c \
- client/ui/node/ui_node_sequence.c \
- client/ui/node/ui_node_string.c \
- client/ui/node/ui_node_special.c \
- client/ui/node/ui_node_spinner.c \
- client/ui/node/ui_node_spinner2.c \
- client/ui/node/ui_node_tab.c \
- client/ui/node/ui_node_tbar.c \
- client/ui/node/ui_node_text.c \
- client/ui/node/ui_node_text2.c \
- client/ui/node/ui_node_textlist.c \
- client/ui/node/ui_node_textentry.c \
- client/ui/node/ui_node_texture.c \
- client/ui/node/ui_node_todo.c \
- client/ui/node/ui_node_vscrollbar.c \
- client/ui/node/ui_node_window.c \
- client/ui/node/ui_node_zone.c \
+ client/ui/node/ui_node_abstractvalue.cpp \
+ client/ui/node/ui_node_abstractoption.cpp \
+ client/ui/node/ui_node_abstractscrollbar.cpp \
+ client/ui/node/ui_node_abstractscrollable.cpp \
+ client/ui/node/ui_node_bar.cpp \
+ client/ui/node/ui_node_base.cpp \
+ client/ui/node/ui_node_baseinventory.cpp \
+ client/ui/node/ui_node_battlescape.cpp \
+ client/ui/node/ui_node_button.cpp \
+ client/ui/node/ui_node_checkbox.cpp \
+ client/ui/node/ui_node_data.cpp \
+ client/ui/node/ui_node_video.cpp \
+ client/ui/node/ui_node_container.cpp \
+ client/ui/node/ui_node_controls.cpp \
+ client/ui/node/ui_node_custombutton.cpp \
+ client/ui/node/ui_node_editor.cpp \
+ client/ui/node/ui_node_ekg.cpp \
+ client/ui/node/ui_node_image.cpp \
+ client/ui/node/ui_node_item.cpp \
+ client/ui/node/ui_node_keybinding.cpp \
+ client/ui/node/ui_node_linechart.cpp \
+ client/ui/node/ui_node_map.cpp \
+ client/ui/node/ui_node_material_editor.cpp \
+ client/ui/node/ui_node_model.cpp \
+ client/ui/node/ui_node_messagelist.cpp \
+ client/ui/node/ui_node_option.cpp \
+ client/ui/node/ui_node_optionlist.cpp \
+ client/ui/node/ui_node_optiontree.cpp \
+ client/ui/node/ui_node_panel.cpp \
+ client/ui/node/ui_node_radar.cpp \
+ client/ui/node/ui_node_radiobutton.cpp \
+ client/ui/node/ui_node_rows.cpp \
+ client/ui/node/ui_node_selectbox.cpp \
+ client/ui/node/ui_node_sequence.cpp \
+ client/ui/node/ui_node_string.cpp \
+ client/ui/node/ui_node_special.cpp \
+ client/ui/node/ui_node_spinner.cpp \
+ client/ui/node/ui_node_spinner2.cpp \
+ client/ui/node/ui_node_tab.cpp \
+ client/ui/node/ui_node_tbar.cpp \
+ client/ui/node/ui_node_text.cpp \
+ client/ui/node/ui_node_text2.cpp \
+ client/ui/node/ui_node_textlist.cpp \
+ client/ui/node/ui_node_textentry.cpp \
+ client/ui/node/ui_node_texture.cpp \
+ client/ui/node/ui_node_todo.cpp \
+ client/ui/node/ui_node_vscrollbar.cpp \
+ client/ui/node/ui_node_window.cpp \
+ client/ui/node/ui_node_zone.cpp \
\
- common/binaryexpressionparser.c \
- common/cmd.c \
- common/http.c \
- common/ioapi.c \
- common/unzip.c \
- common/bsp.c \
- common/grid.c \
- common/cmodel.c \
- common/common.c \
- common/cvar.c \
- common/files.c \
- common/list.c \
- common/md4.c \
- common/md5.c \
- common/mem.c \
- common/msg.c \
- common/net.c \
- common/netpack.c \
- common/dbuffer.c \
- common/pqueue.c \
- common/scripts.c \
- common/tracing.c \
- common/routing.c \
- common/xml.c \
+ common/binaryexpressionparser.cpp \
+ common/cmd.cpp \
+ common/http.cpp \
+ common/ioapi.cpp \
+ common/unzip.cpp \
+ common/bsp.cpp \
+ common/grid.cpp \
+ common/cmodel.cpp \
+ common/common.cpp \
+ common/cvar.cpp \
+ common/files.cpp \
+ common/list.cpp \
+ common/md4.cpp \
+ common/md5.cpp \
+ common/mem.cpp \
+ common/msg.cpp \
+ common/net.cpp \
+ common/netpack.cpp \
+ common/dbuffer.cpp \
+ common/pqueue.cpp \
+ common/scripts.cpp \
+ common/tracing.cpp \
+ common/routing.cpp \
+ common/xml.cpp \
\
- server/sv_ccmds.c \
- server/sv_game.c \
- server/sv_init.c \
- server/sv_log.c \
- server/sv_main.c \
- server/sv_mapcycle.c \
- server/sv_rma.c \
- server/sv_send.c \
- server/sv_user.c \
- server/sv_world.c \
+ server/sv_ccmds.cpp \
+ server/sv_game.cpp \
+ server/sv_init.cpp \
+ server/sv_log.cpp \
+ server/sv_main.cpp \
+ server/sv_mapcycle.cpp \
+ server/sv_rma.cpp \
+ server/sv_send.cpp \
+ server/sv_user.cpp \
+ server/sv_world.cpp \
\
- client/renderer/r_array.c \
- client/renderer/r_bsp.c \
- client/renderer/r_draw.c \
- client/renderer/r_corona.c \
- client/renderer/r_entity.c \
- client/renderer/r_font.c \
- client/renderer/r_flare.c \
- client/renderer/r_framebuffer.c \
- client/renderer/r_geoscape.c \
- client/renderer/r_image.c \
- client/renderer/r_light.c \
- client/renderer/r_lightmap.c \
- client/renderer/r_main.c \
- client/renderer/r_material.c \
- client/renderer/r_matrix.c \
- client/renderer/r_misc.c \
- client/renderer/r_mesh.c \
- client/renderer/r_mesh_anim.c \
- client/renderer/r_model.c \
- client/renderer/r_model_alias.c \
- client/renderer/r_model_brush.c \
- client/renderer/r_model_dpm.c \
- client/renderer/r_model_md2.c \
- client/renderer/r_model_md3.c \
- client/renderer/r_model_obj.c \
- client/renderer/r_particle.c \
- client/renderer/r_program.c \
- client/renderer/r_sdl.c \
- client/renderer/r_surface.c \
- client/renderer/r_state.c \
- client/renderer/r_sphere.c \
- client/renderer/r_thread.c \
+ client/renderer/r_array.cpp \
+ client/renderer/r_bsp.cpp \
+ client/renderer/r_draw.cpp \
+ client/renderer/r_corona.cpp \
+ client/renderer/r_entity.cpp \
+ client/renderer/r_font.cpp \
+ client/renderer/r_flare.cpp \
+ client/renderer/r_framebuffer.cpp \
+ client/renderer/r_geoscape.cpp \
+ client/renderer/r_image.cpp \
+ client/renderer/r_light.cpp \
+ client/renderer/r_lightmap.cpp \
+ client/renderer/r_main.cpp \
+ client/renderer/r_material.cpp \
+ client/renderer/r_matrix.cpp \
+ client/renderer/r_misc.cpp \
+ client/renderer/r_mesh.cpp \
+ client/renderer/r_mesh_anim.cpp \
+ client/renderer/r_model.cpp \
+ client/renderer/r_model_alias.cpp \
+ client/renderer/r_model_brush.cpp \
+ client/renderer/r_model_dpm.cpp \
+ client/renderer/r_model_md2.cpp \
+ client/renderer/r_model_md3.cpp \
+ client/renderer/r_model_obj.cpp \
+ client/renderer/r_particle.cpp \
+ client/renderer/r_program.cpp \
+ client/renderer/r_sdl.cpp \
+ client/renderer/r_surface.cpp \
+ client/renderer/r_state.cpp \
+ client/renderer/r_sphere.cpp \
+ client/renderer/r_thread.cpp \
\
- shared/bfd.c \
- shared/byte.c \
- shared/mathlib.c \
- shared/mathlib_extra.c \
- shared/mutex.c \
- shared/utf8.c \
- shared/images.c \
- shared/stringhunk.c \
- shared/infostring.c \
- shared/parse.c \
- shared/shared.c \
+ shared/bfd.cpp \
+ shared/byte.cpp \
+ shared/mathlib.cpp \
+ shared/mathlib_extra.cpp \
+ shared/mutex.cpp \
+ shared/utf8.cpp \
+ shared/images.cpp \
+ shared/stringhunk.cpp \
+ shared/infostring.cpp \
+ shared/parse.cpp \
+ shared/shared.cpp \
\
- game/q_shared.c \
- game/chr_shared.c \
- game/inv_shared.c \
- game/inventory.c \
+ game/q_shared.cpp \
+ game/chr_shared.cpp \
+ game/inv_shared.cpp \
+ game/inventory.cpp \
\
$(MXML_SRCS)
ifneq ($(findstring $(TARGET_OS), netbsd freebsd linux),)
$(TARGET)_SRCS += \
- ports/linux/linux_main.c \
- ports/unix/unix_console.c \
- ports/unix/unix_files.c \
- ports/unix/unix_shared.c \
- ports/unix/unix_main.c
+ ports/linux/linux_main.cpp \
+ ports/unix/unix_console.cpp \
+ ports/unix/unix_files.cpp \
+ ports/unix/unix_shared.cpp \
+ ports/unix/unix_main.cpp
$(TARGET)_LDFLAGS +=
endif
ifeq ($(TARGET_OS),mingw32)
$(TARGET)_SRCS +=\
- ports/windows/win_backtrace.c \
- ports/windows/win_console.c \
- ports/windows/win_shared.c \
- ports/windows/win_main.c \
+ ports/windows/win_backtrace.cpp \
+ ports/windows/win_console.cpp \
+ ports/windows/win_shared.cpp \
+ ports/windows/win_main.cpp \
ports/windows/ufo.rc
$(TARGET)_LDFLAGS +=
endif
@@ -279,31 +279,31 @@ endif
ifeq ($(TARGET_OS),darwin)
$(TARGET)_SRCS += \
ports/macosx/osx_main.m \
- ports/unix/unix_console.c \
- ports/unix/unix_files.c \
- ports/unix/unix_shared.c \
- ports/unix/unix_main.c
+ ports/unix/unix_console.cpp \
+ ports/unix/unix_files.cpp \
+ ports/unix/unix_shared.cpp \
+ ports/unix/unix_main.cpp
$(TARGET)_LDFLAGS +=
endif
ifeq ($(TARGET_OS),solaris)
$(TARGET)_SRCS += \
- ports/solaris/solaris_main.c \
- ports/unix/unix_console.c \
- ports/unix/unix_files.c \
- ports/unix/unix_shared.c \
- ports/unix/unix_main.c
+ ports/solaris/solaris_main.cpp \
+ ports/unix/unix_console.cpp \
+ ports/unix/unix_files.cpp \
+ ports/unix/unix_shared.cpp \
+ ports/unix/unix_main.cpp
$(TARGET)_LDFLAGS +=
endif
ifeq ($(TARGET_OS),android)
$(TARGET)_SRCS += \
- ports/android/android_console.c \
- ports/android/android_debugger.c \
- ports/android/android_main.c \
- ports/android/android_system.c \
- ports/unix/unix_shared.c \
- ports/unix/unix_files.c
+ ports/android/android_console.cpp \
+ ports/android/android_debugger.cpp \
+ ports/android/android_main.cpp \
+ ports/android/android_system.cpp \
+ ports/unix/unix_shared.cpp \
+ ports/unix/unix_files.cpp
endif
ifeq ($(HARD_LINKED_GAME),1)
diff --git a/build/modules/ufo2map.mk b/build/modules/ufo2map.mk
index 9b4079d5376..ad95f97da3b 100644
--- a/build/modules/ufo2map.mk
+++ b/build/modules/ufo2map.mk
@@ -16,56 +16,56 @@ ifeq ($(SSE),1)
endif
$(TARGET)_SRCS = \
- tools/ufo2map/ufo2map.c \
- tools/ufo2map/lighting.c \
- tools/ufo2map/bsp.c \
- tools/ufo2map/bspbrush.c \
- tools/ufo2map/csg.c \
- tools/ufo2map/faces.c \
- tools/ufo2map/levels.c \
- tools/ufo2map/lightmap.c \
- tools/ufo2map/map.c \
- tools/ufo2map/patches.c \
- tools/ufo2map/portals.c \
- tools/ufo2map/routing.c \
- tools/ufo2map/textures.c \
- tools/ufo2map/tree.c \
- tools/ufo2map/threads.c \
- tools/ufo2map/writebsp.c \
- tools/ufo2map/check/checkentities.c \
- tools/ufo2map/check/checklib.c \
- tools/ufo2map/check/check.c \
- tools/ufo2map/common/aselib.c \
- tools/ufo2map/common/bspfile.c \
- tools/ufo2map/common/polylib.c \
- tools/ufo2map/common/scriplib.c \
- tools/ufo2map/common/trace.c \
+ tools/ufo2map/ufo2map.cpp \
+ tools/ufo2map/lighting.cpp \
+ tools/ufo2map/bsp.cpp \
+ tools/ufo2map/bspbrush.cpp \
+ tools/ufo2map/csg.cpp \
+ tools/ufo2map/faces.cpp \
+ tools/ufo2map/levels.cpp \
+ tools/ufo2map/lightmap.cpp \
+ tools/ufo2map/map.cpp \
+ tools/ufo2map/patches.cpp \
+ tools/ufo2map/portals.cpp \
+ tools/ufo2map/routing.cpp \
+ tools/ufo2map/textures.cpp \
+ tools/ufo2map/tree.cpp \
+ tools/ufo2map/threads.cpp \
+ tools/ufo2map/writebsp.cpp \
+ tools/ufo2map/check/checkentities.cpp \
+ tools/ufo2map/check/checklib.cpp \
+ tools/ufo2map/check/check.cpp \
+ tools/ufo2map/common/aselib.cpp \
+ tools/ufo2map/common/bspfile.cpp \
+ tools/ufo2map/common/polylib.cpp \
+ tools/ufo2map/common/scriplib.cpp \
+ tools/ufo2map/common/trace.cpp \
\
- shared/mathlib.c \
- shared/mutex.c \
- shared/byte.c \
- shared/images.c \
- shared/parse.c \
- shared/shared.c \
- shared/entitiesdef.c \
- shared/utf8.c \
+ shared/mathlib.cpp \
+ shared/mutex.cpp \
+ shared/byte.cpp \
+ shared/images.cpp \
+ shared/parse.cpp \
+ shared/shared.cpp \
+ shared/entitiesdef.cpp \
+ shared/utf8.cpp \
\
- common/files.c \
- common/list.c \
- common/mem.c \
- common/unzip.c \
- common/tracing.c \
- common/routing.c \
- common/ioapi.c
+ common/files.cpp \
+ common/list.cpp \
+ common/mem.cpp \
+ common/unzip.cpp \
+ common/tracing.cpp \
+ common/routing.cpp \
+ common/ioapi.cpp
ifeq ($(TARGET_OS),mingw32)
$(TARGET)_SRCS+=\
- ports/windows/win_shared.c
+ ports/windows/win_shared.cpp
else
$(TARGET)_SRCS+= \
- ports/unix/unix_files.c \
- ports/unix/unix_shared.c \
- ports/unix/unix_main.c
+ ports/unix/unix_files.cpp \
+ ports/unix/unix_shared.cpp \
+ ports/unix/unix_main.cpp
endif
$(TARGET)_OBJS := $(call ASSEMBLE_OBJECTS,$(TARGET))
diff --git a/build/modules/ufoded.mk b/build/modules/ufoded.mk
index 19569cf5e09..4e984ac1f5a 100644
--- a/build/modules/ufoded.mk
+++ b/build/modules/ufoded.mk
@@ -12,94 +12,94 @@ $(TARGET)_LDFLAGS += $(BFD_LIBS) $(INTL_LIBS) $(SDL_LIBS) $(CURL_LIBS) $(SO_LIB
$(TARGET)_CFLAGS += -DCOMPILE_UFO -DDEDICATED_ONLY $(BFD_CFLAGS) $(INTL_CFLAGS) $(SDL_CFLAGS) $(CURL_CFLAGS)
$(TARGET)_SRCS = \
- common/cmd.c \
- common/http.c \
- common/ioapi.c \
- common/unzip.c \
- common/bsp.c \
- common/grid.c \
- common/cmodel.c \
- common/common.c \
- common/cvar.c \
- common/files.c \
- common/list.c \
- common/md4.c \
- common/md5.c \
- common/mem.c \
- common/msg.c \
- common/dbuffer.c \
- common/net.c \
- common/netpack.c \
- common/pqueue.c \
- common/scripts.c \
- common/tracing.c \
- common/routing.c \
+ common/cmd.cpp \
+ common/http.cpp \
+ common/ioapi.cpp \
+ common/unzip.cpp \
+ common/bsp.cpp \
+ common/grid.cpp \
+ common/cmodel.cpp \
+ common/common.cpp \
+ common/cvar.cpp \
+ common/files.cpp \
+ common/list.cpp \
+ common/md4.cpp \
+ common/md5.cpp \
+ common/mem.cpp \
+ common/msg.cpp \
+ common/dbuffer.cpp \
+ common/net.cpp \
+ common/netpack.cpp \
+ common/pqueue.cpp \
+ common/scripts.cpp \
+ common/tracing.cpp \
+ common/routing.cpp \
\
- server/sv_ccmds.c \
- server/sv_game.c \
- server/sv_init.c \
- server/sv_log.c \
- server/sv_main.c \
- server/sv_mapcycle.c \
- server/sv_rma.c \
- server/sv_send.c \
- server/sv_user.c \
- server/sv_world.c \
- server/sv_clientstub.c \
+ server/sv_ccmds.cpp \
+ server/sv_game.cpp \
+ server/sv_init.cpp \
+ server/sv_log.cpp \
+ server/sv_main.cpp \
+ server/sv_mapcycle.cpp \
+ server/sv_rma.cpp \
+ server/sv_send.cpp \
+ server/sv_user.cpp \
+ server/sv_world.cpp \
+ server/sv_clientstub.cpp \
\
- shared/bfd.c \
- shared/byte.c \
- shared/stringhunk.c \
- shared/infostring.c \
- shared/mathlib.c \
- shared/mutex.c \
- shared/parse.c \
- shared/shared.c \
- shared/utf8.c \
+ shared/bfd.cpp \
+ shared/byte.cpp \
+ shared/stringhunk.cpp \
+ shared/infostring.cpp \
+ shared/mathlib.cpp \
+ shared/mutex.cpp \
+ shared/parse.cpp \
+ shared/shared.cpp \
+ shared/utf8.cpp \
\
- game/q_shared.c \
- game/inv_shared.c \
- game/chr_shared.c
+ game/q_shared.cpp \
+ game/inv_shared.cpp \
+ game/chr_shared.cpp
ifneq ($(findstring $(TARGET_OS), netbsd freebsd linux),)
$(TARGET)_SRCS += \
- ports/linux/linux_main.c \
- ports/unix/unix_console.c \
- ports/unix/unix_files.c \
- ports/unix/unix_shared.c \
- ports/unix/unix_main.c
+ ports/linux/linux_main.cpp \
+ ports/unix/unix_console.cpp \
+ ports/unix/unix_files.cpp \
+ ports/unix/unix_shared.cpp \
+ ports/unix/unix_main.cpp
endif
ifeq ($(TARGET_OS),mingw32)
$(TARGET)_SRCS += \
- ports/windows/win_backtrace.c \
- ports/windows/win_console.c \
- ports/windows/win_shared.c \
- ports/windows/win_main.c \
+ ports/windows/win_backtrace.cpp \
+ ports/windows/win_console.cpp \
+ ports/windows/win_shared.cpp \
+ ports/windows/win_main.cpp \
ports/windows/ufo.rc
endif
ifeq ($(TARGET_OS),darwin)
$(TARGET)_SRCS += \
ports/macosx/osx_main.m \
- ports/unix/unix_console.c \
- ports/unix/unix_files.c \
- ports/unix/unix_shared.c \
- ports/unix/unix_main.c
+ ports/unix/unix_console.cpp \
+ ports/unix/unix_files.cpp \
+ ports/unix/unix_shared.cpp \
+ ports/unix/unix_main.cpp
endif
ifeq ($(TARGET_OS),solaris)
$(TARGET)_SRCS += \
- ports/solaris/solaris_main.c \
- ports/unix/unix_console.c \
- ports/unix/unix_files.c \
- ports/unix/unix_shared.c \
- ports/unix/unix_main.c
+ ports/solaris/solaris_main.cpp \
+ ports/unix/unix_console.cpp \
+ ports/unix/unix_files.cpp \
+ ports/unix/unix_shared.cpp \
+ ports/unix/unix_main.cpp
endif
ifeq ($(HARD_LINKED_GAME),1)
$(TARGET)_SRCS += $(game_SRCS) \
- game/inventory.c
+ game/inventory.cpp
else
$(TARGET)_DEPS := game
endif
diff --git a/build/modules/ufomodel.mk b/build/modules/ufomodel.mk
index 2e31a3a4998..5016397e9b7 100644
--- a/build/modules/ufomodel.mk
+++ b/build/modules/ufomodel.mk
@@ -16,37 +16,37 @@ ifeq ($(SSE),1)
endif
$(TARGET)_SRCS = \
- tools/ufomodel/ufomodel.c \
+ tools/ufomodel/ufomodel.cpp \
\
- shared/mathlib.c \
- shared/mutex.c \
- shared/byte.c \
- shared/images.c \
- shared/parse.c \
- shared/shared.c \
- shared/utf8.c \
+ shared/mathlib.cpp \
+ shared/mutex.cpp \
+ shared/byte.cpp \
+ shared/images.cpp \
+ shared/parse.cpp \
+ shared/shared.cpp \
+ shared/utf8.cpp \
\
- common/files.c \
- common/list.c \
- common/mem.c \
- common/unzip.c \
- common/ioapi.c \
+ common/files.cpp \
+ common/list.cpp \
+ common/mem.cpp \
+ common/unzip.cpp \
+ common/ioapi.cpp \
\
- client/renderer/r_model.c \
- client/renderer/r_model_alias.c \
- client/renderer/r_model_dpm.c \
- client/renderer/r_model_md2.c \
- client/renderer/r_model_md3.c \
- client/renderer/r_model_obj.c
+ client/renderer/r_model.cpp \
+ client/renderer/r_model_alias.cpp \
+ client/renderer/r_model_dpm.cpp \
+ client/renderer/r_model_md2.cpp \
+ client/renderer/r_model_md3.cpp \
+ client/renderer/r_model_obj.cpp
ifeq ($(TARGET_OS),mingw32)
$(TARGET)_SRCS+=\
- ports/windows/win_shared.c
+ ports/windows/win_shared.cpp
else
$(TARGET)_SRCS+= \
- ports/unix/unix_files.c \
- ports/unix/unix_shared.c \
- ports/unix/unix_main.c
+ ports/unix/unix_files.cpp \
+ ports/unix/unix_shared.cpp \
+ ports/unix/unix_main.cpp
endif
$(TARGET)_OBJS := $(call ASSEMBLE_OBJECTS,$(TARGET))
diff --git a/build/modules/ufoslicer.mk b/build/modules/ufoslicer.mk
index 5cfd4821a0a..8e8c361064e 100644
--- a/build/modules/ufoslicer.mk
+++ b/build/modules/ufoslicer.mk
@@ -12,34 +12,34 @@ $(TARGET)_LDFLAGS += -lpng -ljpeg -lm -lz $(SDL_LIBS) $(SDL_IMAGE_LIBS)
$(TARGET)_CFLAGS += -DCOMPILE_MAP $(SDL_CFLAGS) $(SDL_IMAGE_CFLAGS)
$(TARGET)_SRCS = \
- tools/ufoslicer.c \
+ tools/ufoslicer.cpp \
\
- common/bspslicer.c \
- common/files.c \
- common/list.c \
- common/mem.c \
- common/unzip.c \
- common/ioapi.c \
+ common/bspslicer.cpp \
+ common/files.cpp \
+ common/list.cpp \
+ common/mem.cpp \
+ common/unzip.cpp \
+ common/ioapi.cpp \
\
- tools/ufo2map/common/bspfile.c \
- tools/ufo2map/common/scriplib.c \
+ tools/ufo2map/common/bspfile.cpp \
+ tools/ufo2map/common/scriplib.cpp \
\
- shared/mathlib.c \
- shared/mutex.c \
- shared/byte.c \
- shared/images.c \
- shared/parse.c \
- shared/shared.c \
- shared/utf8.c
+ shared/mathlib.cpp \
+ shared/mutex.cpp \
+ shared/byte.cpp \
+ shared/images.cpp \
+ shared/parse.cpp \
+ shared/shared.cpp \
+ shared/utf8.cpp
ifeq ($(TARGET_OS),mingw32)
$(TARGET)_SRCS+=\
- ports/windows/win_shared.c
+ ports/windows/win_shared.cpp
else
$(TARGET)_SRCS+= \
- ports/unix/unix_files.c \
- ports/unix/unix_shared.c \
- ports/unix/unix_main.c
+ ports/unix/unix_files.cpp \
+ ports/unix/unix_shared.cpp \
+ ports/unix/unix_main.cpp
endif
$(TARGET)_OBJS := $(call ASSEMBLE_OBJECTS,$(TARGET))
diff --git a/build/projects/game.cbp b/build/projects/game.cbp
index dba427cf8c6..b731a90ba62 100644
--- a/build/projects/game.cbp
+++ b/build/projects/game.cbp
@@ -63,205 +63,205 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/build/projects/testall.cbp b/build/projects/testall.cbp
index 56e563a0f79..9a6663a8e99 100644
--- a/build/projects/testall.cbp
+++ b/build/projects/testall.cbp
@@ -115,1037 +115,1037 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+