From 379f7c682bde74431fec36d801e6bc6ea42b6878 Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Sat, 20 Aug 2005 11:41:05 +0000
Subject: [PATCH] menu and sounds

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@31 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/clientgame.cpp   | 2 +-
 source/src/menus.cpp        | 1 +
 source/src/renderextras.cpp | 4 ++--
 source/src/sound.cpp        | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index d59f303b..c047008b 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -125,7 +125,7 @@ dynent *newdynent()                 // create a new blank player or monster
     d->outsidemap = false;
     d->inwater = false;
     d->radius = 1.1f;
-    d->eyeheight = 3.2f;
+    d->eyeheight = 4.25f;
     d->aboveeye = 0.7f;
     d->frags = 0;
     d->plag = 0;
diff --git a/source/src/menus.cpp b/source/src/menus.cpp
index f431fa1d..df8beb85 100644
--- a/source/src/menus.cpp
+++ b/source/src/menus.cpp
@@ -121,6 +121,7 @@ bool menukey(int code, bool isdown)
         {
             menuset(-1);
             if(!menustack.empty()) menuset(menustack.pop());
+            execute("musicvol 0; music $menu_music");
             return true;
         }
         else if(code==SDLK_UP || code==-4) menusel--;
diff --git a/source/src/renderextras.cpp b/source/src/renderextras.cpp
index 4182d6ed..5e815fe3 100644
--- a/source/src/renderextras.cpp
+++ b/source/src/renderextras.cpp
@@ -48,7 +48,7 @@ void blendbox(int x1, int y1, int x2, int y2, bool border)
     glDisable(GL_TEXTURE_2D);
     glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
     glBegin(GL_QUADS);
-    if(border) glColor3d(0.5, 0.3, 0.4); 
+    if(border) glColor3d(0.7, 0.7, 0.7); //glColor3d(0.5, 0.3, 0.4); 
     else glColor3d(1.0, 1.0, 1.0);
     glVertex2i(x1, y1);
     glVertex2i(x2, y1);
@@ -58,7 +58,7 @@ void blendbox(int x1, int y1, int x2, int y2, bool border)
     glDisable(GL_BLEND);
     glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
     glBegin(GL_POLYGON);
-    glColor3d(0.2, 0.7, 0.4); 
+    glColor3d(0.6, 0.6, 0.6); //glColor3d(0.2, 0.7, 0.4); 
     glVertex2i(x1, y1);
     glVertex2i(x2, y1);
     glVertex2i(x2, y2);
diff --git a/source/src/sound.cpp b/source/src/sound.cpp
index 26ec40cf..c4ac8b7f 100644
--- a/source/src/sound.cpp
+++ b/source/src/sound.cpp
@@ -76,7 +76,7 @@ void music(char *name)
     if(soundvol && musicvol)
     {
         string sn;
-        strcpy_s(sn, "packages/");
+        strcpy_s(sn, "packages/songs/");
         strcat_s(sn, name);
         #ifdef USE_MIXER
             if(mod = Mix_LoadMUS(path(sn)))