More GUI image location changes and chat displays longer.

12 files changed, 8 insertions, 31 deletions

diff --git a/data/bar.bmp b/data/bar.bmp
deleted file mode 100644
index 680db6d6..00000000
--- a/data/bar.bmp
+++ /dev/null
diff --git a/data/bar_filled.bmp b/data/bar_filled.bmp
deleted file mode 100644
index 299c4eb7..00000000
--- a/data/bar_filled.bmp
+++ /dev/null
diff --git a/data/core/graphics/gui/dialog_left.bmp b/data/core/graphics/gui/dialog_left.bmp
new file mode 100644
index 00000000..3a6f82ec
--- /dev/null
+++ b/data/core/graphics/gui/dialog_left.bmp
diff --git a/data/core/graphics/gui/dialog_middle.bmp b/data/core/graphics/gui/dialog_middle.bmp
new file mode 100644
index 00000000..82acc9d5
--- /dev/null
+++ b/data/core/graphics/gui/dialog_middle.bmp
diff --git a/data/core/graphics/gui/dialog_right.bmp b/data/core/graphics/gui/dialog_right.bmp
new file mode 100644
index 00000000..ee4772ff
--- /dev/null
+++ b/data/core/graphics/gui/dialog_right.bmp
diff --git a/data/core/graphics/gui/radioin.bmp b/data/core/graphics/gui/radioin.bmp
new file mode 100644
index 00000000..d3d4d4ce
--- /dev/null
+++ b/data/core/graphics/gui/radioin.bmp
diff --git a/data/core/graphics/gui/radioout.bmp b/data/core/graphics/gui/radioout.bmp
new file mode 100644
index 00000000..2dd6a8d9
--- /dev/null
+++ b/data/core/graphics/gui/radioout.bmp
diff --git a/src/game.h b/src/game.h
index 5598d5ba..958f3880 100644
--- a/src/game.h
+++ b/src/game.h
@@ -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);