general fixes. fixed scoreboard

2 files changed, 29 insertions, 2 deletions

diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index 3288fa65..8a2c5523 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -1562,10 +1562,31 @@ void render_scoreboard(obj_game *gameobj, float x, float y, float w, int team, c
 	}
 
 	float tw = gfx_pretty_text_width( 64, title, -1);
-	gfx_pretty_text(x+w/2-tw/2, y, 64, title, -1);
-	
 
+	if(team == -1)
+	{
+		gfx_pretty_text(x+w/2-tw/2, y, 64, title, -1);
+	}
+	else
+	{
+		gfx_pretty_text(x+10, y, 64, title, -1);
+		
+		char buf[128];
+		sprintf(buf, "%d", gameobj->teamscore[team&1]);
+		tw = gfx_pretty_text_width(64, buf, -1);
+		gfx_pretty_text(x+w-tw-40, y, 64, buf, -1);
+	}
+	
 	y += 64.0f;
+	
+	/*
+	if(team)
+	{
+		char buf[128];
+		sprintf(buf, "%4d", gameobj->teamscore[team&1]);
+		gfx_pretty_text(x+w/2-tw/2, y, 32, buf, -1);
+	}*/
+
 
 	// find players
 	const obj_player *players[MAX_CLIENTS] = {0};
diff --git a/src/game/client/mapres_tilemap.h b/src/game/client/mapres_tilemap.h
index 6e9d81be..df2da7a3 100644
--- a/src/game/client/mapres_tilemap.h
+++ b/src/game/client/mapres_tilemap.h
@@ -7,6 +7,12 @@ int tilemap_init();
 // renders the tilemaps
 void tilemap_render(float scale, int fg);
 
+enum
+{
+	TILEFLAG_VFLIP=1,
+	TILEFLAG_HFLIP=2,
+};
+
 struct mapres_tilemap
 {
 	int image;