Attachment #221813 for bug #289276

View | Details | Raw Unified | Return to bug 289276
Collapse All | Expand All

Lines 210-216 Link Here

(-)game_editor-origin/gameEditor/FunctionPanel.cpp (-2 / +2 lines)
210	EditorDirectory editDir;	210	EditorDirectory editDir;
211		211
212	TiXmlDocument doc;	212	TiXmlDocument doc;
213	if(!doc.LoadFile("functions.xml")) return false;	213	if(!doc.LoadFile("/usr/share/games/game-editor/functions.xml")) return false;
214		214
215	//Check tree	215	//Check tree
216	TiXmlElement* root = NULL;	216	TiXmlElement* root = NULL;
Lines 1213-1216 Link Here
1213	}	1213	}
1214		1214
1215		1215
1216	#endif	1216	#endif

Lines 10-16 Link Here

(-)game_editor-origin/gameEditor/makefile.editor (-1 / +1 lines)
10	CFLAGS = $(INCS) $(TARGET) -DNO_STDIO_REDIRECT -DNO_LONG_LONG -DNO_DIRENT -DNO_FCNTL -DNO_STAT -DNO_UNISTD -DNO_TERMIOS -DNO_PIPE -DNO_POSIX -DNO_LONGLONG -DNO_HISTORY $(BUILD_TYPE) $(GAMEEDITOR_TYPE)	10	CFLAGS = $(INCS) $(TARGET) -DNO_STDIO_REDIRECT -DNO_LONG_LONG -DNO_DIRENT -DNO_FCNTL -DNO_STAT -DNO_UNISTD -DNO_TERMIOS -DNO_PIPE -DNO_POSIX -DNO_LONGLONG -DNO_HISTORY $(BUILD_TYPE) $(GAMEEDITOR_TYPE)
11		11
12	ifeq (,$(findstring LLVM,$(TARGET)))	12	ifeq (,$(findstring LLVM,$(TARGET)))
13	LIBSYSTEM = -lstdc++ -lpthread -lX11 /usr/lib32/libXext.so	13	LIBSYSTEM = -lstdc++ -lpthread -lX11 /usr/lib/libXext.so
14	CL=$(CC)	14	CL=$(CC)
15	CLFLAGS=$(CFLAGS)	15	CLFLAGS=$(CFLAGS)
16	else	16	else

Lines 264-270 Link Here

(-)game_editor-origin/gameEngine/EditBox.cpp (-1 / +1 lines)
264	EditorDirectory dir;	264	EditorDirectory dir;
265		265
266	icon = new Actor("ged_VariableSelector_icon", this);	266	icon = new Actor("ged_VariableSelector_icon", this);
267	icon->AddAnimation("icon", "b_xy.png", 1, 1);	267	icon->AddAnimation("icon", "/usr/share/games/game-editor/b_xy.png", 1, 1);
268	icon->SetPos(9 + (Width() - icon->Width()) / 2, 10 + (Height() - icon->Height()) / 2);	268	icon->SetPos(9 + (Width() - icon->Width()) / 2, 10 + (Height() - icon->Height()) / 2);
269	icon->getSprite()->SetHitTest(false);	269	icon->getSprite()->SetHitTest(false);
270	}	270	}

Lines 859-865 Link Here

(-)game_editor-origin/gameEngine/GameControl.cpp (-1 / +1 lines)
859		859
860	#define EDITOR_FRAME_RATE 120 //Use >= 60 to avoid flick in editor mode	860	#define EDITOR_FRAME_RATE 120 //Use >= 60 to avoid flick in editor mode
861		861
862	gedString EDITOR_DAT("editor.dat");	862	gedString EDITOR_DAT("/usr/share/games/game-editor/editor.dat");
863		863
864	gedString AXIS_NAME("Axis");	864	gedString AXIS_NAME("Axis");
865	gedString REGION_NAME("gedRegion");	865	gedString REGION_NAME("gedRegion");

Lines 535-541 Link Here

(-)game_editor-origin/wxGameEditor/Behavior/wxJigsawEditor/wxJigsawEditorMainFrame.cpp (-2 / +2 lines)
535		535
536	void wxJigsawEditorMainFrame::LoadConfig()	536	void wxJigsawEditorMainFrame::LoadConfig()
537	{	537	{
538	wxString configFileName = wxT("config.xml");	538	wxString configFileName = wxT("/usr/share/game/game-editor/config.xml");
539	if(wxFileExists(configFileName))	539	if(wxFileExists(configFileName))
540	{	540	{
541	m_XmlIO.DeserializeFromXml(configFileName);	541	m_XmlIO.DeserializeFromXml(configFileName);
Lines 544-550 Link Here
544		544
545	void wxJigsawEditorMainFrame::SaveConfig()	545	void wxJigsawEditorMainFrame::SaveConfig()
546	{	546	{
547	wxString configFileName = wxT("config.xml");	547	wxString configFileName = wxT("/usr/share/game/game-editor/config.xml");
548	m_XmlIO.SerializeToXml(configFileName, true);	548	m_XmlIO.SerializeToXml(configFileName, true);
549	}	549	}
550		550

Return to bug 289276