Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

console height now relative to y resolution instead of always 600 pixels

Browse Source 
This was SVN commit r1188.
This commit is contained in:
janwas 2004-09-22 14:01:50 +00:00
parent 7c157c5f90
commit ab7b542c20
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/main.cpp
View File

@ -74,23 +74,6 @@
#include "Network/Server.h" #include "Network/Server.h"
int cstr_seq = 0;
const char* a1="default";
const char* a2="const CStr&";
const char* a3="const TCHAR*";
const char* a4="const TCHAR*, size_t";
const char* a5="a5";
const char* a6="a6";
const char* a7="a7";
const char* a8="a8";
const char* a9="a9";
const char* a10="a10";
const char* a11="a11";
const char* a12="a12";
const char* a13="a13";
CConsole* g_Console = 0; CConsole* g_Console = 0;
extern int conInputHandler(const SDL_Event* ev); extern int conInputHandler(const SDL_Event* ev);
@ -131,6 +114,8 @@ static CMusicPlayer MusicPlayer;
CStr g_CursorName = "test"; CStr g_CursorName = "test";
extern int allow_reload(); extern int allow_reload();
extern int dir_add_watch(const char* const dir, bool watch_subdirs); extern int dir_add_watch(const char* const dir, bool watch_subdirs);
@ -361,7 +346,14 @@ static int handler(const SDL_Event* ev)
{ {
// MusicPlayer.open("audio/music/germanic peace 3.ogg"); // MusicPlayer.open("audio/music/germanic peace 3.ogg");
// MusicPlayer.play(); // MusicPlayer.play();
Handle hs = sound_open("audio/voice/hellenes/citizensoldier/Attack-ZeusSaviourandVictory-Zeus-soter-kai-nike.ogg"); Handle hs = sound_open(
//"audio/music/germanic peace 3.ogg"
"audio/voice/hellenes/citizensoldier/Attack-ZeusSaviourandVictory-Zeus-soter-kai-nike.ogg"
//"audio/voice/hellenes/citizensoldier/Stance-HoldYourPosition-Kataschete-ten-taxin.ogg"
//"audio/voice/hellenes/citizensoldier/Econ-Chop-Kopto.ogg"
//"audio/voice/hellenes/citizensoldier/lead_em.wav"
);
sound_play(hs); sound_play(hs);
} }
break; break;
@ -673,8 +665,11 @@ static void InitVfs(char* argv0)
static void psInit() static void psInit()
{ {
g_Console->SetSize(0, g_yres-600.f, (float)g_xres, 600.f); // console
{ {
float ConsoleHeight = g_yres * 0.6f;
g_Console->SetSize(0, g_yres-ConsoleHeight, (float)g_xres, ConsoleHeight);
// Calculate and store the line spacing // Calculate and store the line spacing
CFont font("console"); CFont font("console");
g_Console->m_iFontHeight = font.GetLineSpacing(); g_Console->m_iFontHeight = font.GetLineSpacing();