openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Delete a useless function

Browse Source
This commit is contained in:
Celtic Minstrel
2014-04-16 17:49:59 -04:00
parent 199f84e0db
commit d7e372b7a9
4 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osx/boe.graphics.cpp
View File

@@ -30,7 +30,6 @@
#include "boe.menus.h"
extern sf::RenderWindow mainPtr;
extern RECT windRect;
extern short stat_window,give_delays;
extern eGameMode overall_mode;
extern short current_spell_range,town_type;
@@ -184,6 +183,7 @@ void adjust_window_mode()
else {
mainPtr.create(desktop, "Blades of Exile", sf::Style::None, winSettings);
mainPtr.setPosition({0,0});
RECT windRect(mainPtr);
switch (display_mode) {
case 0: ul.x = (windRect.right - 560) / 2; ul.y = (windRect.bottom - 422) / 2 + 14; break;
case 1: ul.x = 10; ul.y = 28; break;

25
osx/boe.main.cpp
View File

@@ -34,7 +34,6 @@
//extern short talk_curs, key_curs, look_curs, current_cursor;
/* Mac stuff globals */
RECT windRect, Drag_Rect;
bool All_Done = false;
sf::Event event;
sf::RenderWindow mainPtr;
@@ -163,8 +162,6 @@ int main(void)
init_fileio();
init_graph_tool();
Set_Window_Drag_Bdry();
init_buf();
set_up_apple_events();
@@ -255,15 +252,6 @@ void Initialize(void)
//SetQDGlobalsRandomSeed(time);
srand(time(NULL));
//
// Make a new window for drawing in, and it must be a color window.
// The window is full screen size, made smaller to make it more visible.
//
sf::VideoMode screen = sf::VideoMode::getDesktopMode();
windRect.left = windRect.top = 0;
windRect.width() = screen.width;
windRect.height() = screen.height;
init_directories();
// stored_key = open_pref_file();
@@ -289,19 +277,6 @@ void Initialize(void)
}
// TODO: This may be unneeded?
void Set_Window_Drag_Bdry()
{
sf::VideoMode screen = sf::VideoMode::getDesktopMode();
Drag_Rect.left = Drag_Rect.top = 0;
Drag_Rect.width() = screen.width;
Drag_Rect.height() = screen.height;
// Drag_Rect = (**(GrayRgn)).rgnBBox;
Drag_Rect.left += DRAG_EDGE;
Drag_Rect.right -= DRAG_EDGE;
Drag_Rect.bottom -= DRAG_EDGE;
}
void Handle_One_Event()
{
static const long fiveTicks = time_in_ticks(5).asMilliseconds();

1
osx/boe.main.h
View File

@@ -3,7 +3,6 @@
int main(void);
void Initialize(void);
void Set_Window_Drag_Bdry();
void Handle_One_Event();
bool handle_dialog_event() ;
void Handle_Update();

3
osx/dialogxml/dialog.cpp
View File

@@ -285,6 +285,7 @@ template<> pair<string,cTextMsg*> cDialog::parse(Element& who /*text*/){
// TODO: De-magic the | character
if(type == TiXmlNode::ELEMENT && val == "br") content += '|'; // because vertical bar is replaced by a newline when drawing strings
else if(type == TiXmlNode::TEXT)
// TODO: One small problem with this: newlines should be replaced by a space instead of being removed altogether. Or something like that.
copy_if(val.begin(), val.end(), std::inserter(content, content.end()), isAllowableCharacter);
else{
val = '<' + val + '>';
@@ -483,6 +484,7 @@ template<> pair<string,cButton*> cDialog::parse(Element& who /*button*/){
if(content.length() > 0) throw xBadVal("button","<content>",content + val,node->Row(),node->Column(),fname);
// p.second->labelWithKey = true;
}else if(type == TiXmlNode::TEXT)
// TODO: One small problem with this: newlines should be replaced by a space instead of being removed altogether. Or something like that.
copy_if(val.begin(), val.end(), std::inserter(content, content.end()), isAllowableCharacter);
else{
val = '<' + val + '>';
@@ -638,6 +640,7 @@ template<> pair<string,cLed*> cDialog::parse(Element& who /*LED*/){
int type = node->Type();
node->GetValue(&val);
if(type == TiXmlNode::TEXT)
// TODO: One small problem with this: newlines should be replaced by a space instead of being removed altogether. Or something like that.
copy_if(val.begin(), val.end(), std::inserter(content, content.end()), isAllowableCharacter);
else{
val = '<' + val + '>';