Attachment #84903 for bug #66302

Lines 21-28 Link Here

(-)gameengine.h.orig (+2 lines)
21		21
22	#include <stdarg.h>	22	#include <stdarg.h>
23	#include <vector>	23	#include <vector>
		24	using namespace std;
24	#include <fxdefs.h>	25	#include <fxdefs.h>
25	#include <FXString.h>	26	#include <FXString.h>
		27	using namespace FX;
26		28
27	#include "fxrepton.h"	29	#include "fxrepton.h"
28		30




		exit(1);
	}

       	FXMenuBar *menubar;

        FXToolBarShell *dragshell1 = new FXToolBarShell(this, FRAME_RAISED);
        menubar = new FXMenuBar(this, dragshell1, FRAME_RAISED|LAYOUT_SIDE_TOP|LAYOUT_FILL_X);
        new FXToolBarGrip(menubar, menubar, FXMenuBar::ID_TOOLBARGRIP);

       	FXStatusBar *statusbar;
	statusbar = new FXStatusBar(this, LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|STATUSBAR_WITH_DRAGCORNER|FRAME_RAISED);

        filemenu = new FXMenuPane(this);
        new FXMenuCommand(filemenu, "&Restart level\tF2\tRestart current level.", 0, this, ID_RESTART);

		if (!lastPane || lastPackage != ep.package) {
			// remove "[n] " from "[n] PackageName"
			FXString package = ep.package;
  			if (package.find(']') != -1)
				package = package.after(']').trim();
			FXMenuCascade *cascade = new FXMenuCascade(episodemenu, package);
        		lastPane = new FXMenuPane(this);

		}
		// remove "[n] " from "[n] EpisodeName"
		FXString name = ep.name;
  		if (name.find(']') != -1)
			name = name.after(']').trim();
		new FXMenuCommand(lastPane, name, 0, this, ep.id);
	}

	episode = episodes[1];
	episode.level = 1;

	timerhandle = getApp()->addTimeout(this, ID_TIMER, 100);
}

MainWindow::~MainWindow()


long MainWindow::onCmdIconify(FXObject *, FXSelector, void *)
{
	minimize();
	return 1;
}


		typedef vector<Episode>::const_iterator I;
		for (I i = episodes.begin(); i != episodes.end(); ++i) {
  			Episode ep = *i;
  			if (ep.id == FXSELID(sel)) {
  				if (buttons & SHIFTMASK) {
  					episode.spritespath = ep.spritespath;
					game->loadSprites(ep.spritespath);

	typedef vector<Episode>::const_iterator I;
	for (I i = episodes.begin(); i != episodes.end(); ++i) {
  		Episode ep = *i;
  		if (ep.id == FXSELID(sel)) {
			FXint checked = episode.id == ep.id;
		    	sender->handle(this, MKUINT(ID_SETINTVALUE, SEL_COMMAND), (void*)&checked);
			break;

		}
  	}

	timerhandle = getApp()->addTimeout(this, ID_TIMER, delay);
	return 1;
}


Lines 20-25 Link Here

(-)mainwindow.h.orig (+1 lines)
20	#define MAINWINDOW_H	20	#define MAINWINDOW_H
21		21
22	#include <vector>	22	#include <vector>
		23	using namespace std;
23		24
24	#include <fx.h>	25	#include <fx.h>
25		26

Return to bug 66302

Lines 82-95 Link Here

(-)mainwindow.cpp.orig (-13 / +13 lines)
82	exit(1);	82	exit(1);
83	}	83	}
84		84
85	FXMenubar *menubar;	85	FXMenuBar *menubar;
86		86
87	FXToolbarShell *dragshell1 = new FXToolbarShell(this, FRAME_RAISED);	87	FXToolBarShell *dragshell1 = new FXToolBarShell(this, FRAME_RAISED);
88	menubar = new FXMenubar(this, dragshell1, FRAME_RAISED\|LAYOUT_SIDE_TOP\|LAYOUT_FILL_X);	88	menubar = new FXMenuBar(this, dragshell1, FRAME_RAISED\|LAYOUT_SIDE_TOP\|LAYOUT_FILL_X);
89	new FXToolbarGrip(menubar, menubar, FXMenubar::ID_TOOLBARGRIP);	89	new FXToolBarGrip(menubar, menubar, FXMenuBar::ID_TOOLBARGRIP);
90		90
91	FXStatusbar *statusbar;	91	FXStatusBar *statusbar;
92	statusbar = new FXStatusbar(this, LAYOUT_SIDE_BOTTOM\|LAYOUT_FILL_X\|STATUSBAR_WITH_DRAGCORNER\|FRAME_RAISED);	92	statusbar = new FXStatusBar(this, LAYOUT_SIDE_BOTTOM\|LAYOUT_FILL_X\|STATUSBAR_WITH_DRAGCORNER\|FRAME_RAISED);
93		93
94	filemenu = new FXMenuPane(this);	94	filemenu = new FXMenuPane(this);
95	new FXMenuCommand(filemenu, "&Restart level\tF2\tRestart current level.", 0, this, ID_RESTART);	95	new FXMenuCommand(filemenu, "&Restart level\tF2\tRestart current level.", 0, this, ID_RESTART);
Lines 111-117 Link Here
111	if (!lastPane \|\| lastPackage != ep.package) {	111	if (!lastPane \|\| lastPackage != ep.package) {
112	// remove "[n] " from "[n] PackageName"	112	// remove "[n] " from "[n] PackageName"
113	FXString package = ep.package;	113	FXString package = ep.package;
114	if (package.findf(']') != -1)	114	if (package.find(']') != -1)
115	package = package.after(']').trim();	115	package = package.after(']').trim();
116	FXMenuCascade *cascade = new FXMenuCascade(episodemenu, package);	116	FXMenuCascade *cascade = new FXMenuCascade(episodemenu, package);
117	lastPane = new FXMenuPane(this);	117	lastPane = new FXMenuPane(this);
Lines 120-126 Link Here
120	}	120	}
121	// remove "[n] " from "[n] EpisodeName"	121	// remove "[n] " from "[n] EpisodeName"
122	FXString name = ep.name;	122	FXString name = ep.name;
123	if (name.findf(']') != -1)	123	if (name.find(']') != -1)
124	name = name.after(']').trim();	124	name = name.after(']').trim();
125	new FXMenuCommand(lastPane, name, 0, this, ep.id);	125	new FXMenuCommand(lastPane, name, 0, this, ep.id);
126	}	126	}
Lines 179-185 Link Here
179	episode = episodes[1];	179	episode = episodes[1];
180	episode.level = 1;	180	episode.level = 1;
181		181
182	timerhandle = getApp()->addTimeout(100, this, ID_TIMER);	182	timerhandle = getApp()->addTimeout(this, ID_TIMER, 100);
183	}	183	}
184		184
185	MainWindow::~MainWindow()	185	MainWindow::~MainWindow()
Lines 356-362 Link Here
356		356
357	long MainWindow::onCmdIconify(FXObject , FXSelector, void )	357	long MainWindow::onCmdIconify(FXObject , FXSelector, void )
358	{	358	{
359	iconify();	359	minimize();
360	return 1;	360	return 1;
361	}	361	}
362		362
Lines 376-382 Link Here
376	typedef vector<Episode>::const_iterator I;	376	typedef vector<Episode>::const_iterator I;
377	for (I i = episodes.begin(); i != episodes.end(); ++i) {	377	for (I i = episodes.begin(); i != episodes.end(); ++i) {
378	Episode ep = *i;	378	Episode ep = *i;
379	if (ep.id == SELID(sel)) {	379	if (ep.id == FXSELID(sel)) {
380	if (buttons & SHIFTMASK) {	380	if (buttons & SHIFTMASK) {
381	episode.spritespath = ep.spritespath;	381	episode.spritespath = ep.spritespath;
382	game->loadSprites(ep.spritespath);	382	game->loadSprites(ep.spritespath);
Lines 399-405 Link Here
399	typedef vector<Episode>::const_iterator I;	399	typedef vector<Episode>::const_iterator I;
400	for (I i = episodes.begin(); i != episodes.end(); ++i) {	400	for (I i = episodes.begin(); i != episodes.end(); ++i) {
401	Episode ep = *i;	401	Episode ep = *i;
402	if (ep.id == SELID(sel)) {	402	if (ep.id == FXSELID(sel)) {
403	FXint checked = episode.id == ep.id;	403	FXint checked = episode.id == ep.id;
404	sender->handle(this, MKUINT(ID_SETINTVALUE, SEL_COMMAND), (void*)&checked);	404	sender->handle(this, MKUINT(ID_SETINTVALUE, SEL_COMMAND), (void*)&checked);
405	break;	405	break;
Lines 638-644 Link Here
638	}	638	}
639	}	639	}
640		640
641	timerhandle = getApp()->addTimeout(delay, this, ID_TIMER);	641	timerhandle = getApp()->addTimeout(this, ID_TIMER, delay);
642	return 1;	642	return 1;
643	}	643	}
644		644