From 23681b514385949d645e7975c7254a1b5cacae04 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 11 Nov 2012 22:12:51 +0000
Subject: [PATCH] Move similar/main/playsave.c -> similar/main/playsave.cpp

---
 SConstruct                                | 2 +-
 similar/main/{playsave.c => playsave.cpp} | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename similar/main/{playsave.c => playsave.cpp} (99%)

diff --git a/SConstruct b/SConstruct
index 6f06dbc0a..a8874fbfe 100644
--- a/SConstruct
+++ b/SConstruct
@@ -788,7 +788,7 @@ class DXXProgram(DXXCommon):
 'main/paging.cpp',
 'main/physics.cpp',
 'main/player.cpp',
-'main/playsave.c',
+'main/playsave.cpp',
 'main/polyobj.c',
 'main/powerup.c',
 'main/render.c',
diff --git a/similar/main/playsave.c b/similar/main/playsave.cpp
similarity index 99%
rename from similar/main/playsave.c
rename to similar/main/playsave.cpp
index 992693dee..6d6b4d1fe 100644
--- a/similar/main/playsave.c
+++ b/similar/main/playsave.cpp
@@ -780,9 +780,11 @@ int read_player_file()
 	PHYSFS_file *file;
 #if defined(DXX_BUILD_DESCENT_I)
 	int shareware_file = -1;
+	int player_file_size;
 #elif defined(DXX_BUILD_DESCENT_II)
 	int rewrite_it=0;
 	int swap = 0;
+	short player_file_version;
 #endif
 
 	Assert(Player_num>=0 && Player_num<MAX_PLAYERS);
@@ -811,7 +813,7 @@ int read_player_file()
 	// sizeof the player file to determine what kinda player file we are
 	// dealing with so that we can do the right thing
 	PHYSFS_seek(file, 0);
-	int player_file_size = PHYSFS_fileLength(file);
+	player_file_size = PHYSFS_fileLength(file);
 #endif
 	int id;
 	PHYSFS_readSLE32(file, &id);
@@ -823,7 +825,7 @@ int read_player_file()
 	PlayerCfg.DefaultDifficulty = PHYSFSX_readInt(file);
 	PlayerCfg.AutoLeveling = PHYSFSX_readInt(file);
 #elif defined(DXX_BUILD_DESCENT_II)
-	short player_file_version = PHYSFSX_readShort(file);
+	player_file_version = PHYSFSX_readShort(file);
 #endif
 
 	if (id!=SAVE_FILE_ID) {