fix compiler errors

Unvanquished · Jul 10, 2015 · f3bf2a7 · f3bf2a7
1 parent b61dcb1
commit f3bf2a7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/gamelogic/cgame/cg_rocket_draw.cpp b/src/gamelogic/cgame/cg_rocket_draw.cpp
@@ -560,8 +560,9 @@ class CrosshairIndicatorHudElement : public HudElement
 class CrosshairHudElement : public HudElement {
 public:
 	CrosshairHudElement( const Rocket::Core::String& tag ) :
-			HudElement( tag, ELEMENT_BOTH, true ),
-			color{255, 255, 255, 255} {}
+			HudElement( tag, ELEMENT_BOTH, true ) {
+		color[0] = color[1] = color[2] = color[3] = 255;
+	}
 
 	void OnPropertyChange( const Rocket::Core::PropertyNameList& changed_properties )
 	{

diff --git a/src/gamelogic/sgame/sg_trapcalls.h b/src/gamelogic/sgame/sg_trapcalls.h
@@ -37,7 +37,7 @@ int              trap_Argc();
 void             trap_Argv( int n, char *buffer, int bufferLength );
 void             trap_SendConsoleCommand( const char *text );
 int              trap_FS_FOpenFile( const char *qpath, fileHandle_t *f, fsMode_t mode );
-void             trap_FS_Read( void *buffer, int len, fileHandle_t f );
+int              trap_FS_Read( void *buffer, int len, fileHandle_t f );
 int              trap_FS_Write( const void *buffer, int len, fileHandle_t f );
 void             trap_FS_Rename( const char *from, const char *to );
 void             trap_FS_FCloseFile( fileHandle_t f );

diff --git a/src/gamelogic/shared/bg_misc.cpp b/src/gamelogic/shared/bg_misc.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define N_(x) x
 
 int                                trap_FS_FOpenFile( const char *qpath, fileHandle_t *f, fsMode_t mode );
-void                               trap_FS_Read( void *buffer, int len, fileHandle_t f );
+int                                trap_FS_Read( void *buffer, int len, fileHandle_t f );
 int                                trap_FS_Write( const void *buffer, int len, fileHandle_t f );
 void                               trap_FS_FCloseFile( fileHandle_t f );
 void                               trap_FS_Seek( fileHandle_t f, long offset, fsOrigin_t origin );  // fsOrigin_t