diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-01-16 16:04:16 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-01-16 16:04:16 +0000 |
commit | cf815e520dda01b291a8020db04c67c4ff1ebfbf (patch) | |
tree | 0d14d20493b314ee0d53afd3dbd2a74a9db14e6b /src | |
parent | cd5625304014f70e063e524cfd1bbb8125d9a3a5 (diff) | |
download | mana-cf815e520dda01b291a8020db04c67c4ff1ebfbf.tar.gz mana-cf815e520dda01b291a8020db04c67c4ff1ebfbf.tar.bz2 mana-cf815e520dda01b291a8020db04c67c4ff1ebfbf.tar.xz mana-cf815e520dda01b291a8020db04c67c4ff1ebfbf.zip |
More GUI image location changes and chat displays longer.
Diffstat (limited to 'src')
-rw-r--r-- | src/game.h | 2 | ||||
-rw-r--r-- | src/gui/gui.cpp | 18 | ||||
-rw-r--r-- | src/gui/gui.h | 5 | ||||
-rw-r--r-- | src/gui/radiobutton.cpp | 8 | ||||
-rw-r--r-- | src/gui/window.cpp | 6 |
5 files changed, 8 insertions, 31 deletions
@@ -34,7 +34,7 @@ #include <stdio.h> #include <allegro.h> -#define SPEECH_TIME 40 +#define SPEECH_TIME 80 #define EMOTION_TIME 40 #define SPEECH_MAX_TIME 100 diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index eab34a4b..451c6fac 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -420,23 +420,6 @@ void loadListboxSkin() { } -void loadBarSkin() { - BITMAP *temp1 = load_bitmap("data/bar.bmp", NULL); - BITMAP *temp2 = load_bitmap("data/bar_filled.bmp", NULL); - gui_skin.bar.bg.grid[0] = create_bitmap(3,11); - gui_skin.bar.bg.grid[1] = create_bitmap(1,11); - gui_skin.bar.bg.grid[2] = create_bitmap(3,11); - blit(temp1, gui_skin.bar.bg.grid[0], 0, 0, 0, 0, 3, 11); - blit(temp1, gui_skin.bar.bg.grid[1], 4, 0, 0, 0, 1, 11); - blit(temp1, gui_skin.bar.bg.grid[2], 13, 0, 0, 0, 3, 11); - gui_skin.bar.bg.grid[3] = create_bitmap(3,11); - gui_skin.bar.bg.grid[4] = create_bitmap(1,11); - gui_skin.bar.bg.grid[5] = create_bitmap(3,11); - blit(temp2, gui_skin.bar.bg.grid[3], 0, 0, 0, 0, 3, 11); - blit(temp2, gui_skin.bar.bg.grid[4], 4, 0, 0, 0, 1, 11); - blit(temp2, gui_skin.bar.bg.grid[5], 13, 0, 0, 0, 3, 11); -} - void loadDialogSkin() { char **tokens; int tokenCount; @@ -518,7 +501,6 @@ int gui_load_skin(const char* skinname) { loadTextboxSkin(); loadListboxSkin(); loadDialogSkin(); - loadBarSkin(); pop_config_state(); set_mouse_sprite((BITMAP *)gui_gfx[7].dat); diff --git a/src/gui/gui.h b/src/gui/gui.h index 73858be3..b4abaad8 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -129,17 +129,12 @@ typedef struct { } LexDialog; typedef struct { - LexSkinnedRect bg; -} LexBar; - -typedef struct { LexButton button; LexSlider slider; LexCheckbox checkbox; LexTextbox textbox; LexListbox listbox; LexDialog dialog; - LexBar bar; } LexSkin; extern LexSkin gui_skin; diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp index f5bbeca5..4e90cbb1 100644 --- a/src/gui/radiobutton.cpp +++ b/src/gui/radiobutton.cpp @@ -29,10 +29,10 @@ RadioButton::RadioButton(const std::string& caption, const std::string& group, gcn::RadioButton(caption, group, marked) { ResourceManager *resman = ResourceManager::getInstance(); - radioNormal = resman->getImage("Skin/radioout.bmp"); - radioChecked = resman->getImage("Skin/radioin.bmp"); - radioDisabled = resman->getImage("Skin/radioout.bmp"); - radioDisabledChecked = resman->getImage("Skin/radioin.bmp"); + radioNormal = resman->getImage("core/graphics/gui/radioout.bmp"); + radioChecked = resman->getImage("core/graphics/gui/radioin.bmp"); + radioDisabled = resman->getImage("core/graphics/gui/radioout.bmp"); + radioDisabledChecked = resman->getImage("core/graphics/gui/radioin.bmp"); } void RadioButton::drawBox(gcn::Graphics* graphics) diff --git a/src/gui/window.cpp b/src/gui/window.cpp index 665295cb..e768e91f 100644 --- a/src/gui/window.cpp +++ b/src/gui/window.cpp @@ -50,9 +50,9 @@ Window::Window(const std::string& text, bool modal, Window *parent): // Load dialog title bar image ResourceManager *resman = ResourceManager::getInstance(); - dLeft = resman->getImage("Skin/dialogLeft.bmp"); - dMid = resman->getImage("Skin/dialogMiddle.bmp"); - dRight = resman->getImage("Skin/dialogRight.bmp"); + dLeft = resman->getImage("core/graphics/gui/dialog_left.bmp"); + dMid = resman->getImage("core/graphics/gui/dialog_middle.bmp"); + dRight = resman->getImage("core/graphics/gui/dialog_right.bmp"); // Register mouse listener addMouseListener(this); |