summaryrefslogtreecommitdiff
path: root/src/screen
diff options
context:
space:
mode:
Diffstat (limited to 'src/screen')
-rw-r--r--src/screen/screen_gameType.c17
-rw-r--r--src/screen/screen_setting.c44
-rw-r--r--src/screen/screen_setting.h4
-rw-r--r--src/screen/screen_world.c4
4 files changed, 42 insertions, 27 deletions
diff --git a/src/screen/screen_gameType.c b/src/screen/screen_gameType.c
index e512b28..fb971db 100644
--- a/src/screen/screen_gameType.c
+++ b/src/screen/screen_gameType.c
@@ -73,11 +73,13 @@ void drawScreenGameType()
drawWidgetTextfield(textfield_ip);
}
+#if 0
if( check_server->status == TRUE )
{
setSettingIP (getParamElse ("--ip", "127.0.0.1"));
setSettingPort (atoi (getParamElse("--port", "2200")));
}
+#endif
if( check_client->status == TRUE )
drawWidgetButton(button_browser);
@@ -102,7 +104,9 @@ void eventScreenGameType()
eventWidgetButton(button_back);
eventWidgetButton(button_play);
- eventWidgetButton(button_browser);
+
+ if( check_client->status == TRUE )
+ eventWidgetButton(button_browser);
}
void stopScreenGameType()
@@ -199,8 +203,15 @@ void initScreenGameType()
label_ip = newWidgetLabel(getMyText("IP_ADDR"), 300, 145, WIDGET_LABEL_LEFT);
label_port = newWidgetLabel(getMyText("NET_PORT"), 300, 245, WIDGET_LABEL_LEFT);
- textfield_ip = newWidgetTextfield(getParamElse("--ip", "127.0.0.1"), 300, 180);
- textfield_port = newWidgetTextfield(getParamElse("--port", "2200"), 300, 280);
+ textfield_ip = newWidgetTextfield(
+ getParamElse("--ip", "127.0.0.1"),
+ WIDGET_TEXTFIELD_FILTER_IP_OR_DOMAIN,
+ 300, 180);
+
+ textfield_port = newWidgetTextfield(
+ getParamElse("--port", "2200"),
+ WIDGET_TEXTFIELD_FILTER_NUM,
+ 300, 280);
registerScreen( newScreen("gameType", startScreenGameType, eventScreenGameType,
drawScreenGameType, stopScreenGameType) );
diff --git a/src/screen/screen_setting.c b/src/screen/screen_setting.c
index d853265..876c464 100644
--- a/src/screen/screen_setting.c
+++ b/src/screen/screen_setting.c
@@ -141,16 +141,7 @@ void drawScreenSetting()
void eventScreenSetting()
{
int i;
-/*
- int x, y;
- getMousePosition(&x, &y);
-
- if( isMouseClicked() )
- {
- printf("x = %d y = %d\n", x, y);
- }
-*/
eventWidgetTextfield(textfield_count_cound);
eventWidgetTextfield(textfield_name_player1);
@@ -233,11 +224,13 @@ static void initSettingFile()
}
loadValueFromConfigFile(configFile, "COUNT_ROUND", val, STR_SIZE, "15");
- strcpy(textfield_count_cound->text, val);
- loadValueFromConfigFile(configFile, "NAME_PLAYER_RIGHT", val, STR_SIZE, "TUX Warrior #01");
- strcpy(textfield_name_player1->text, val);
- loadValueFromConfigFile(configFile, "NAME_PLAYER_LEFT", val, STR_SIZE, "TUX Warrior #02");
- strcpy(textfield_name_player2->text, val);
+ setWidgetTextFiledText(textfield_count_cound, val);
+
+ loadValueFromConfigFile(configFile, "NAME_PLAYER_RIGHT", val, STR_SIZE, NAME_PLAYER_RIGHT);
+ setWidgetTextFiledText(textfield_name_player1, val);
+
+ loadValueFromConfigFile(configFile, "NAME_PLAYER_LEFT", val, STR_SIZE, NAME_PLAYER_LEFT);
+ setWidgetTextFiledText(textfield_name_player2, val);
loadValueFromConfigFile(configFile, "GUN_DUAL_SIMPLE", val, STR_SIZE, "YES");
check[GUN_DUAL_SIMPLE]->status = isYesOrNO(val);
@@ -281,8 +274,6 @@ static void initSettingFile()
static void saveAndDestroyConfigFile()
{
- char val[STR_SIZE], name2[STR_SIZE];
-
if( configFile == NULL )
{
fprintf(stderr, "i can't save configure, "
@@ -349,10 +340,23 @@ void initScreenSetting()
label_name_player1 = newWidgetLabel(getMyText("NAME_PLAYER1"), 100, WINDOW_SIZE_Y-160, WIDGET_LABEL_LEFT);
label_name_player2 = newWidgetLabel(getMyText("NAME_PLAYER2"), 100, WINDOW_SIZE_Y-120, WIDGET_LABEL_LEFT);
- textfield_count_cound = newWidgetTextfield(getParamElse("--count", "15"), 110+label_count_round->w, WINDOW_SIZE_Y-200);
+ textfield_count_cound = newWidgetTextfield(
+ getParamElse("--count", "15"),
+ WIDGET_TEXTFIELD_FILTER_NUM,
+ 110+label_count_round->w,
+ WINDOW_SIZE_Y-200);
- textfield_name_player1 = newWidgetTextfield(getParamElse("--name1", NAME_PLAYER_RIGHT), 110+label_name_player1->w, WINDOW_SIZE_Y-160);
- textfield_name_player2 = newWidgetTextfield(getParamElse("--name2", NAME_PLAYER_LEFT), 110+label_name_player2->w, WINDOW_SIZE_Y-120);
+ textfield_name_player1 = newWidgetTextfield(
+ getParamElse("--name1", NAME_PLAYER_RIGHT),
+ WIDGET_TEXTFIELD_FILTER_ALPHANUM,
+ 110+label_name_player1->w,
+ WINDOW_SIZE_Y-160);
+
+ textfield_name_player2 = newWidgetTextfield(
+ getParamElse("--name2", NAME_PLAYER_LEFT),
+ WIDGET_TEXTFIELD_FILTER_ALPHANUM,
+ 110+label_name_player2->w,
+ WINDOW_SIZE_Y-120);
for( i = GUN_DUAL_SIMPLE ; i <= GUN_BOMBBALL ; i++ )
{
@@ -458,7 +462,7 @@ bool_t isSettingAnyItem()
}
}
- for( i = BONUS_SPEED ; i <= BONUS_HIDDEN ; i++ )
+ for( i = BONUS_SPEED ; i < BONUS_HIDDEN ; i++ )
{
if( check[i]->status == TRUE )
{
diff --git a/src/screen/screen_setting.h b/src/screen/screen_setting.h
index d80a7a5..2dfb897 100644
--- a/src/screen/screen_setting.h
+++ b/src/screen/screen_setting.h
@@ -6,8 +6,8 @@
#include "main.h"
#define NAME_AI "tuxAI"
-#define NAME_PLAYER_RIGHT "TUX Warrior #01"
-#define NAME_PLAYER_LEFT "TUX Warrior #02"
+#define NAME_PLAYER_RIGHT "name1"
+#define NAME_PLAYER_LEFT "name2"
extern void initScreenSetting();
extern void drawScreenSetting();
diff --git a/src/screen/screen_world.c b/src/screen/screen_world.c
index f5556c9..030c690 100644
--- a/src/screen/screen_world.c
+++ b/src/screen/screen_world.c
@@ -365,7 +365,7 @@ static void eventEsc()
Uint8 *mapa;
mapa = SDL_GetKeyState(NULL);
- if( mapa[(SDLKey)SDLK_ESCAPE] == SDL_PRESSED && isChatActive() == FALSE )
+ if( mapa[(SDLKey)SDLK_ESCAPE] == SDL_PRESSED )
{
setWorldEnd();
return;
@@ -471,7 +471,7 @@ void eventWorld()
addToRadar(thisTux->id,
thisTux->x,
thisTux->y,
- RADAR_TYPE_YOU);
+ RADAR_TYPE_TUX);
}
eventTerm();
generated by cgit v1.2.3 (git 2.46.0) at 2026-09-13 13:13:55 +0000