about summary refs log tree commit diff
path: root/src/game/client
diff options
context:
space:
mode:
authorJakob Fries <jakob.fries@gmail.com>2007-08-14 23:08:30 +0000
committerJakob Fries <jakob.fries@gmail.com>2007-08-14 23:08:30 +0000
commite11e9a71ca92cb5424f1e0e26fe1261b8a723d6d (patch)
treef2037ec206664c61a86a3769f5a7258ebf89eb5e /src/game/client
parent3a8af93e33c0269d79aec015770840e30937d053 (diff)
downloadzcatch-e11e9a71ca92cb5424f1e0e26fe1261b8a723d6d.tar.gz
zcatch-e11e9a71ca92cb5424f1e0e26fe1261b8a723d6d.zip
emoticons version 2
Diffstat (limited to 'src/game/client')
-rw-r--r--src/game/client/game_client.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index 8838cfec..c9b29d8d 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -1302,10 +1302,11 @@ void render_sun(float x, float y)
 	gfx_quads_end();	
 }
 
+const int emoticon_selector_input_num = 30;
 static bool emoticon_selector_inactive_override = false;
 static int emoticon_selector_input_count = 0;
 static int emoticon_selector_input_iter = 0;
-static vec2 emoticon_selector_inputs[10];
+static vec2 emoticon_selector_inputs[emoticon_selector_input_num];
 
 void emoticon_selector_reset()
 {
@@ -1320,16 +1321,16 @@ int emoticon_selector_render()
 
 	if (x || y)
 	{
-		emoticon_selector_inputs[emoticon_selector_input_iter++ % 10] = vec2(x, y);
+		emoticon_selector_inputs[emoticon_selector_input_iter++ % emoticon_selector_input_num] = vec2(x, y);
 		
 		emoticon_selector_input_count++;
-		if (emoticon_selector_input_count > 10)
-			emoticon_selector_input_count = 10;
+		if (emoticon_selector_input_count > emoticon_selector_input_num)
+			emoticon_selector_input_count = emoticon_selector_input_num;
 	}
 
 	float selected_angle = 0;
 
-	if (emoticon_selector_input_count > 5)
+	if (emoticon_selector_input_count > emoticon_selector_input_num/2)
 	{
 		vec2 sum;