ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated VS project file, and fixed several compilation problems.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3262 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2009-03-15 13:22:28 +00:00
parent f5ced788ac
commit e158423562
7 changed files with 39 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/engine.cpp
View File

@ -1,9 +1,11 @@
#include "gui/engine.hpp"
#include <iostream>
#include <assert.h>
#include "gui/screen.hpp"
#include "gui/skin.hpp"
#include "gui/widget.hpp"
#include "io/file_manager.hpp"
#include <iostream>
namespace GUIEngine
{

2
src/gui/font.cpp
View File

@ -19,9 +19,9 @@
#include <vector>
#include "file_manager.hpp"
#include "user_config.hpp"
#include "gui/font.hpp"
#include "io/file_manager.hpp"
#include "utils/string_utils.hpp"
Font* font_gui;

2
src/gui/ptr_vector.hpp
View File

@ -24,7 +24,7 @@
#include <vector>
#include <iostream>
#include <assert.h>
enum VECTOR_TYPE
{

22
src/gui/screen.cpp
View File

@ -1,11 +1,13 @@
#include <iostream>
#include <sstream>
#include <assert.h>
#include "irrlicht.h"
#include "gui/screen.hpp"
#include "gui/engine.hpp"
#include "gui/widget.hpp"
#include "io/file_manager.hpp";
#include <irrlicht.h>
#include <iostream>
#include <irrXML.h>
#include <sstream>
#include "io/file_manager.hpp"
using namespace irr;
@ -120,12 +122,12 @@ void Screen::calculateLayout(ptr_vector<Widget>& widgets, Widget* parent)
widgets[n].x = x;
widgets[n].y = y;
widgets[n].w = left_space*fraction;
widgets[n].w = (int)(left_space*fraction);
x += widgets[n].w;
}
else
{
widgets[n].h = left_space*fraction;
widgets[n].h = (int)(left_space*fraction);
std::string align = widgets[n].m_properties[ PROP_ALIGN ];
if(align.size() < 1 || align == "left") widgets[n].x = x;
@ -280,6 +282,7 @@ bool Screen::OnEvent(const SEvent& event)
}
case KEY_RIGHT:
{
IGUIElement *el = GUIEngine::getGUIEnv()->getFocus();
if(el == NULL) break;
Widget* w = getWidget( el->getID() );
@ -291,7 +294,7 @@ bool Screen::OnEvent(const SEvent& event)
if(widget_to_call->rightPressed())
transmitEvent(widget_to_call, w->m_properties[PROP_ID]);
break;
}
case KEY_UP:
{
IGUIElement *el, *first=NULL, *closest=NULL;
@ -365,6 +368,7 @@ bool Screen::OnEvent(const SEvent& event)
case EGET_BUTTON_CLICKED:
case EGET_SCROLL_BAR_CHANGED:
case EGET_CHECKBOX_CHANGED:
{
Widget* w = getWidget(id);
if(w == NULL) break;
@ -378,7 +382,7 @@ bool Screen::OnEvent(const SEvent& event)
}
else transmitEvent(w, w->m_properties[PROP_ID]);
break;
}
case EGET_ELEMENT_HOVERED:
{
Widget* w = getWidget(id);

4
src/gui/widget.cpp
View File

@ -5,6 +5,10 @@
#include <irrlicht.h>
#include <iostream>
#include <sstream>
#ifndef round
# define round(x) (floor(x+0.5f))
#endif
using namespace irr;
using namespace core;

204
src/ide/vc9/supertuxkart.vcproj
View File

@ -273,125 +273,41 @@
Name="gui"
>
<File
RelativePath="../../../src\gui\base_gui.cpp"
RelativePath="..\..\gui\engine.cpp"
>
</File>
<File
RelativePath="..\..\gui\challenges_menu.cpp"
RelativePath="..\..\gui\font.cpp"
>
</File>
<File
RelativePath="../../../src\gui\char_sel.cpp"
RelativePath="..\..\gui\my_button.cpp"
>
</File>
<File
RelativePath="../../../src\gui\config_controls.cpp"
RelativePath="..\..\gui\race_gui.cpp"
>
</File>
<File
RelativePath="../../../src\gui\config_display.cpp"
RelativePath="..\..\gui\screen.cpp"
>
</File>
<File
RelativePath="../../../src\gui\config_sound.cpp"
RelativePath="..\..\gui\screen_loader.cpp"
>
</File>
<File
RelativePath="../../../src\gui\credits_menu.cpp"
RelativePath="..\..\gui\skin.cpp"
>
</File>
<File
RelativePath="..\..\gui\display_res_confirm.cpp"
>
</File>
<File
RelativePath="..\..\gui\feature_unlocked.cpp"
>
</File>
<File
RelativePath="../../../src\gui\font.cpp"
>
</File>
<File
RelativePath="../../../src\gui\game_mode.cpp"
>
</File>
<File
RelativePath="../../../src\gui\grand_prix_ending.cpp"
>
</File>
<File
RelativePath="../../../src\gui\grand_prix_select.cpp"
>
</File>
<File
RelativePath="..\..\gui\help_page_one.cpp"
>
</File>
<File
RelativePath="..\..\gui\help_page_three.cpp"
>
</File>
<File
RelativePath="..\..\gui\help_page_two.cpp"
>
</File>
<File
RelativePath="../../../src\gui\main_menu.cpp"
>
</File>
<File
RelativePath="../../../src\gui\menu_manager.cpp"
>
</File>
<File
RelativePath="..\..\gui\network_gui.cpp"
>
</File>
<File
RelativePath="../../../src\gui\num_players.cpp"
>
</File>
<File
RelativePath="../../../src\gui\options.cpp"
>
</File>
<File
RelativePath="../../../src\gui\player_controls.cpp"
>
</File>
<File
RelativePath="../../../src\gui\race_gui.cpp"
>
</File>
<File
RelativePath="../../../src\gui\race_menu.cpp"
>
</File>
<File
RelativePath="..\..\gui\race_options.cpp"
>
</File>
<File
RelativePath="../../../src\gui\race_results_gui.cpp"
>
</File>
<File
RelativePath="..\..\gui\start_race_feedback.cpp"
>
</File>
<File
RelativePath="../../../src\gui\track_sel.cpp"
RelativePath="..\..\gui\state_manager.cpp"
>
</File>
<File
RelativePath="..\..\gui\widget.cpp"
>
</File>
<File
RelativePath="..\..\gui\widget_manager.cpp"
>
</File>
</Filter>
<Filter
Name="lisp"
@ -887,123 +803,35 @@
Name="gui"
>
<File
RelativePath="../../../src\gui\base_gui.hpp"
RelativePath="..\..\gui\font.hpp"
>
</File>
<File
RelativePath="..\..\gui\challenges_menu.hpp"
RelativePath="..\..\gui\my_button.hpp"
>
</File>
<File
RelativePath="../../../src\gui\char_sel.hpp"
RelativePath="..\..\gui\ptr_vector.hpp"
>
</File>
<File
RelativePath="../../../src\gui\config_controls.hpp"
RelativePath="..\..\gui\race_gui.hpp"
>
</File>
<File
RelativePath="../../../src\gui\config_display.hpp"
RelativePath="..\..\gui\screen.hpp"
>
</File>
<File
RelativePath="../../../src\gui\config_sound.hpp"
RelativePath="..\..\gui\skin.hpp"
>
</File>
<File
RelativePath="../../../src\gui\credits_menu.hpp"
RelativePath="..\..\gui\state_manager.hpp"
>
</File>
<File
RelativePath="..\..\gui\display_res_confirm.hpp"
>
</File>
<File
RelativePath="..\..\gui\feature_unlocked.hpp"
>
</File>
<File
RelativePath="../../../src\gui\font.hpp"
>
</File>
<File
RelativePath="../../../src\gui\game_mode.hpp"
>
</File>
<File
RelativePath="../../../src\gui\grand_prix_ending.hpp"
>
</File>
<File
RelativePath="../../../src\gui\grand_prix_select.hpp"
>
</File>
<File
RelativePath="..\..\gui\help_page_one.hpp"
>
</File>
<File
RelativePath="..\..\gui\help_page_three.hpp"
>
</File>
<File
RelativePath="..\..\gui\help_page_two.hpp"
>
</File>
<File
RelativePath="../../../src\gui\main_menu.hpp"
>
</File>
<File
RelativePath="../../../src\gui\menu_manager.hpp"
>
</File>
<File
RelativePath="..\..\gui\network_gui.hpp"
>
</File>
<File
RelativePath="../../../src\gui\num_players.hpp"
>
</File>
<File
RelativePath="../../../src\gui\options.hpp"
>
</File>
<File
RelativePath="../../../src\gui\player_controls.hpp"
>
</File>
<File
RelativePath="../../../src\gui\race_gui.hpp"
>
</File>
<File
RelativePath="../../../src\gui\race_menu.hpp"
>
</File>
<File
RelativePath="..\..\gui\race_options.hpp"
>
</File>
<File
RelativePath="../../../src\gui\race_results_gui.hpp"
>
</File>
<File
RelativePath="..\..\gui\start_race_feedback.hpp"
>
</File>
<File
RelativePath="../../../src\gui\track_sel.hpp"
>
</File>
<File
RelativePath="..\..\widget.hpp"
>
</File>
<File
RelativePath="..\..\widget_manager.hpp"
RelativePath="..\..\gui\widget.hpp"
>
</File>
</Filter>

2
src/io/file_manager.cpp
View File

@ -19,7 +19,6 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "io/file_manager.hpp"
#include <unistd.h>
#include <stdexcept>
#include <sstream>
@ -34,6 +33,7 @@
# endif
# define CONFIGDIR "."
#else
# include <unistd.h>
# define CONFIGDIR ".supertuxkart"
#endif