ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/AE/Installer/trunk/source/subs.cpp

Comparing AE/Installer/trunk/source/subs.cpp (file contents):
Revision 314 by gumby, Sun May 3 07:38:12 2009 UTC vs.
Revision 315 by gumby, Sun May 3 15:07:19 2009 UTC

#	Line 45 | Line 45 | bool splitInstances = SPLIT;
45		int main(void)
46		{
47		//      SetConsoleTitle("AE Installer"); windows junk, convert to SDL
48	<	//      system("color 0A");
49	<
48	>	#ifdef WIN32
49	>	system("color 0A");
50	>	#endif
51		cout << "\nWelcome to the AE installer!\n";
52		cout << "\nWhat would you like to do?\n";
53
#	Line 58 | Line 59 | int mainMenu(void)
59		char choice = '0';
60		bool exit = false;
61		int err = 0;
61	–
62		do
63		{
64	<	cout << "\n1. Globalize data\n";
65	<	cout << "2. Install new packages\n";
66	<	cout << "3. Uninstall packages\n";
67	<	cout << "4. See what is installed\n";
68	<	cout << "5. About AE\n";
69	<	cout << "6. Quit\n\n";
70	<
71	<	choice = cin.get();
72	<	cin.ignore(128, '\n');
73	<	switch(choice)
74	<	{
64	>	if( exists( "../GameDataFolder" ) ) {
65	>	cout << "\n1. Install new packages\n";
66	>	cout << "2. Uninstall packages\n";
67	>	cout << "3. See what is installed\n";
68	>	cout << "4. Globalize data\n";
69	>	cout << "5. About AE\n";
70	>	cout << "6. Quit\n\n";
71	>
72	>	choice = cin.get();
73	>	cin.ignore(128, '\n');
74	>	switch(choice)
75	>	{
76		case '1':
77	<	err = globalizeData();
77	>	err = installPackages();
78		break;
79		case '2':
80	<	err = installPackages();
80	>	err = uninstallPackages();
81		break;
82		case '3':
83	<	err = uninstallPackages();
83	>	err = listInstalledPackages();
84		break;
85		case '4':
86	<	err = listInstalledPackages();
86	>	err = globalizeData();
87		break;
88		case '5':
89		err = printInstallerInfo();
#	Line 92 | Line 93 | int mainMenu(void)
93		break;
94		default:
95		cout << "Please choose one of the above numbers, and press Enter.\n\n";
96	+	}
97	+	if (err) // if something fatal happened
98	+	exit = true;
99	+	}
100	+	else {
101	+	cout << "\n1. Globalize data\n";
102	+	cout << "2. About AE\n";
103	+	cout << "3. Quit\n\n";
104	+
105	+	choice = cin.get();
106	+	cin.ignore(128, '\n');
107	+	switch(choice)
108	+	{
109	+	case '1':
110	+	err = globalizeData();
111	+	break;
112	+	case '2':
113	+	err = printInstallerInfo();
114	+	break;
115	+	case '3':
116	+	exit = true;
117	+	break;
118	+	default:
119	+	cout << "Please choose one of the above numbers, and press Enter.\n\n";
120	+	}
121	+	if (err) // if something fatal happened
122	+	exit = true;
123		}
96	–	if (err) // if something fatal happened
97	–	exit = true;
124		} while(!exit);
125	<
126	<	return err;
125	>
126	>	return err;
127		}
128
129		int globalizeData(void)
#	Line 304 | Line 330 | int installPackages(void)
330		//cout << index << " ";
331		system(strClsCmd);
332		cout << (*package_iter).name << "\n";
333	<	for (int character = 1; character <= (*package_iter).name.length() - 1; character++) cout << char(196); //does extended ASCII work in UNIX?
333	>	for (int character = 1; character <= (*package_iter).name.length() - 1; character++) cout << '-';
334		cout << "\n"
335		<< (*package_iter).readme << "\n\n"
336		<< "Please enter a number choice\n"

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)