summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/chat.c2
-rw-r--r--src/client/client.c4
-rw-r--r--src/client/game.c24
-rw-r--r--src/client/layer.c20
-rw-r--r--src/client/saveDialog.c2
-rw-r--r--src/client/saveLoad.c4
-rw-r--r--src/client/screen.c20
-rw-r--r--src/client/screen.h10
8 files changed, 43 insertions, 43 deletions
diff --git a/src/client/chat.c b/src/client/chat.c
index 6ca9ec9..b446b08 100644
--- a/src/client/chat.c
+++ b/src/client/chat.c
@@ -11,7 +11,7 @@
#include "serverSendMsg.h"
#include "net_multiplayer.h"
-#include "screen_world.h"
+#include "world.h"
#include "proto.h"
#include "interface.h"
#include "chat.h"
diff --git a/src/client/client.c b/src/client/client.c
index e92a238..1902be6 100644
--- a/src/client/client.c
+++ b/src/client/client.c
@@ -23,8 +23,8 @@
#include "client.h"
-#include "screen_analyze.h"
-#include "screen_world.h"
+#include "analyze.h"
+#include "world.h"
#include "buffer.h"
#include "udp.h"
diff --git a/src/client/game.c b/src/client/game.c
index e96805b..87676d5 100644
--- a/src/client/game.c
+++ b/src/client/game.c
@@ -20,7 +20,7 @@
#include "interface.h"
#include "screen.h"
#include "font.h"
-#include "screen_settingKeys.h"
+#include "settingKeys.h"
#include "panel.h"
#include "radar.h"
@@ -30,17 +30,17 @@
# include "music.h"
#endif
-#include "screen_world.h"
-#include "screen_mainMenu.h"
-#include "screen_analyze.h"
-#include "screen_setting.h"
-#include "screen_settingKeys.h"
-#include "screen_gameType.h"
-#include "screen_downArena.h"
-#include "screen_choiceArena.h"
-#include "screen_table.h"
-#include "screen_credits.h"
-#include "screen_browser.h"
+#include "world.h"
+#include "mainMenu.h"
+#include "analyze.h"
+#include "setting.h"
+#include "settingKeys.h"
+#include "gameType.h"
+#include "downArena.h"
+#include "choiceArena.h"
+#include "table.h"
+#include "credits.h"
+#include "browser.h"
static void initGame()
{
diff --git a/src/client/layer.c b/src/client/layer.c
index 983a9c8..b6055be 100644
--- a/src/client/layer.c
+++ b/src/client/layer.c
@@ -10,7 +10,7 @@
#include "layer.h"
#include "image.h"
-#include "screen_world.h"
+#include "world.h"
static list_t *listLayer;
@@ -125,27 +125,27 @@ void drawLayer()
void drawLayerCenter(int x, int y)
{
layer_t *this;
- int screen_x, screen_y;
+ int x, y;
int i;
//int count = 0;
- getCenterScreen(&screen_x, &screen_y, x, y, WINDOW_SIZE_X, WINDOW_SIZE_Y);
+ getCenterScreen(&x, &y, x, y, WINDOW_SIZE_X, WINDOW_SIZE_Y);
for (i = 0; i < listLayer->count; i++) {
this = (layer_t *) listLayer->list[i];
- if (this->x + this->w < screen_x ||
- this->x > screen_x + WINDOW_SIZE_X ||
- this->y + this->h < screen_y ||
- this->y > screen_y + WINDOW_SIZE_Y) {
+ if (this->x + this->w < x ||
+ this->x > x + WINDOW_SIZE_X ||
+ this->y + this->h < y ||
+ this->y > y + WINDOW_SIZE_Y) {
continue;
}
//count++;
- drawImage(this->image, this->x - screen_x, this->y - screen_y,
+ drawImage(this->image, this->x - x, this->y - y,
this->px, this->py, this->w, this->h);
- //printf("%d %d\n", this->x - screen_x, this->y - screen_y);
+ //printf("%d %d\n", this->x - x, this->y - y);
}
//printf("count = %d\n", count);
@@ -201,7 +201,7 @@ void drawLayerSplit(int local_x, int local_y, int x, int y, int w, int h)
drawImage(this->image, local_x + (this->x - x), local_y + (this->y - y),
this->px, this->py, this->w, this->h);
- //printf("%d %d\n", this->x - screen_x, this->y - screen_y);
+ //printf("%d %d\n", this->x - x, this->y - y);
}
//printf("count = %d\n", count);
diff --git a/src/client/saveDialog.c b/src/client/saveDialog.c
index 1c832e7..dbf79d7 100644
--- a/src/client/saveDialog.c
+++ b/src/client/saveDialog.c
@@ -64,7 +64,7 @@ void initSaveDialog()
{
activeSaveDialog = FALSE;
- g_background = getImage(IMAGE_GROUP_BASE, "screen_main");
+ g_background = getImage(IMAGE_GROUP_BASE, "main");
widgetLabelMsg = newWidgetLabel("name", SAVE_DIALOG_LOCATIN_X + 20,
SAVE_DIALOG_LOCATIN_Y + 20,
diff --git a/src/client/saveLoad.c b/src/client/saveLoad.c
index b5dbdf2..0448a4f 100644
--- a/src/client/saveLoad.c
+++ b/src/client/saveLoad.c
@@ -16,8 +16,8 @@
#include "saveLoad.h"
-#include "screen_choiceArena.h"
-#include "screen_world.h"
+#include "choiceArena.h"
+#include "world.h"
static void action_saveTux(space_t * space, tux_t * tux, textFile_t * textFile)
{
diff --git a/src/client/screen.c b/src/client/screen.c
index 71d48d8..453aae3 100644
--- a/src/client/screen.c
+++ b/src/client/screen.c
@@ -12,8 +12,8 @@
//#define DEBUG_TIME_DRAW
-static screen_t *currentScreen;
-static screen_t *futureScreen;
+static t *currentScreen;
+static t *futureScreen;
static list_t *listScreen;
@@ -24,10 +24,10 @@ bool_t isScreenInicialized()
return isScreenInit;
}
-screen_t *newScreen(char *name, void (*fce_start) (), void (*fce_event) (),
+t *newScreen(char *name, void (*fce_start) (), void (*fce_event) (),
void (*fce_draw) (), void (*fce_stop) ())
{
- screen_t *new;
+ t *new;
assert(name != NULL);
assert(fce_start != NULL);
@@ -35,7 +35,7 @@ screen_t *newScreen(char *name, void (*fce_start) (), void (*fce_event) (),
assert(fce_draw != NULL);
assert(fce_stop != NULL);
- new = malloc(sizeof(screen_t));
+ new = malloc(sizeof(t));
new->name = strdup(name);
new->fce_start = fce_start;
new->fce_event = fce_event;
@@ -45,7 +45,7 @@ screen_t *newScreen(char *name, void (*fce_start) (), void (*fce_event) (),
return new;
}
-void destroyScreen(screen_t * p)
+void destroyScreen(t * p)
{
assert(p != NULL);
@@ -53,7 +53,7 @@ void destroyScreen(screen_t * p)
free(p);
}
-void registerScreen(screen_t * p)
+void registerScreen(t * p)
{
assert(p != NULL);
@@ -72,13 +72,13 @@ void initScreen()
isScreenInit = TRUE;
}
-static screen_t *findScreen(char *name)
+static t *findScreen(char *name)
{
- screen_t *this;
+ t *this;
int i;
for (i = 0; i < listScreen->count; i++) {
- this = (screen_t *) (listScreen->list[i]);
+ this = (t *) (listScreen->list[i]);
assert(this != NULL);
if (strcmp(name, this->name) == 0) {
diff --git a/src/client/screen.h b/src/client/screen.h
index 3227bfe..77a1a16 100644
--- a/src/client/screen.h
+++ b/src/client/screen.h
@@ -5,22 +5,22 @@
# include "main.h"
-typedef struct screen_struct {
+typedef struct struct {
char *name;
void (*fce_start) ();
void (*fce_event) ();
void (*fce_draw) ();
void (*fce_stop) ();
-} screen_t;
+} t;
extern bool_t isScreenInicialized();
-extern screen_t *newScreen(char *name,
+extern t *newScreen(char *name,
void (*fce_start) (), void (*fce_event) (),
void (*fce_draw) (), void (*fce_stop) ());
-extern void destroyScreen(screen_t * p);
-extern void registerScreen(screen_t * p);
+extern void destroyScreen(t * p);
+extern void registerScreen(t * p);
extern void initScreen();
extern void setScreen(char *name);
extern void switchScreen();
generated by cgit v1.2.3 (git 2.46.0) at 2026-09-13 10:42:45 +0000