scummvm-compile-fix.patch on Ticket #8273 – Attachment – ScummVM :: Bugs

scummvm/Makefile

diff -Nurp -X X.scummvm /cvs/scummvm/Makefile scummvm/Makefile

-              old
+               include config.mak
 # Uncomment this for stricter compile time code verification
 # CXXFLAGS+= -Wshadow -Werror
 CXXFLAGS:= -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas $(CXXFLAGS)
+CXXFLAGS:= -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas $(CXXFLAGS)
 # Even more warnings...
 CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion
 CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor

scummvm/bs2/console.cpp

diff -Nurp -X X.scummvm /cvs/scummvm/bs2/console.cpp scummvm/bs2/console.cpp

-              old
+               void Con_display_events()	// (James11jul
 #else // not debug
 void    Print_to_console(const char *format,...) {};
 void    Temp_print_to_console(const char *format,...) {};
 void    Clear_console_line(void) {};
 void    Scroll_console(void) {};
 void    Init_console(void) {};
 void    StartConsole(void) {};
+void    Print_to_console(const char *format,...) {}
+void    Temp_print_to_console(const char *format,...) {}
+void    Clear_console_line(void) {}
+void    Scroll_console(void) {}
+void    Init_console(void) {}
+void    StartConsole(void) {}
 #endif  // _SWORD2_DEBUG

scummvm/bs2/debug.cpp

diff -Nurp -X X.scummvm /cvs/scummvm/bs2/debug.cpp scummvm/bs2/debug.cpp

-              old
+               void Print_current_info(void)	//Tony30Oc
 //--------------------------------------------------------------------------------------
 #else // not debug
 void Draw_debug_graphics(void) {};
+void Draw_debug_graphics(void) {}
 #endif  // _SWORD2_DEBUG
 //--------------------------------------------------------------------------------------

scummvm/common/list.h

diff -Nurp -X X.scummvm /cvs/scummvm/common/list.h scummvm/common/list.h

old	new	protected:
126	126	}
127	127	};
128	128
129		};// End of namespace ScummVM
	129	} // End of namespace ScummVM
130	130
131	131	#endif

scummvm/common/map.h

diff -Nurp -X X.scummvm /cvs/scummvm/common/map.h scummvm/common/map.h

-              old
+               class String;
 typedef Map<String, String> StringMap;
 };      // End of namespace ScummVM
+}       // End of namespace ScummVM
 #endif

scummvm/common/rect.h

diff -Nurp -X X.scummvm /cvs/scummvm/common/rect.h scummvm/common/rect.h

old	new	struct Rect {
108	108	}
109	109	};
110	110
111		}; // End of namespace ScummVM
	111	} // End of namespace ScummVM
112	112
113	113	#endif

scummvm/common/str.cpp

diff -Nurp -X X.scummvm /cvs/scummvm/common/str.cpp scummvm/common/str.cpp

old	new	bool operator != (const char y, const C*
266	266	return x != y;
267	267	}
268	268
269		}; // End of namespace ScummVM
	269	} // End of namespace ScummVM

scummvm/common/str.h

diff -Nurp -X X.scummvm /cvs/scummvm/common/str.h scummvm/common/str.h

old	new	public:
141	141	}
142	142	};
143	143
144		}; // End of namespace ScummVM
	144	} // End of namespace ScummVM
145	145
146	146	#endif

scummvm/sky/compact.cpp

Binary files /cvs/scummvm/monkeyvga.s00 and scummvm/monkeyvga.s00 differ
Binary files /cvs/scummvm/scummvm and scummvm/scummvm differ
diff -Nurp -X X.scummvm /cvs/scummvm/sky/compact.cpp scummvm/sky/compact.cpp

old	new	namespace SkyTalkAnims {
51	51	extern bool animTalkTableIsPointer[];
52	52	extern uint16 animTalkTableVal[];
53	53	extern void *animTalkTablePtr[];
54		};
	54	}
55	55
56	56	namespace SkyCompact {
57	57
…	…	void patchFor288(void) {
602	602	((Compact *)SkyCompact::data_3[409])->actionScript = 0x3127; // slot_28
603	603	}
604	604
605		};
	605	}
606	606

scummvm/sky/compact.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compact.h scummvm/sky/compact.h

-              old
+               namespace SkyCompact {
         extern uint16 ss_auto[];
         extern uint16 wit_auto[];
         extern uint16 minif_auto[];
 };
+}
 #endif

scummvm/sky/compacts/0compact.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/0compact.h scummvm/sky/compacts/0compact.h

-              old
+               void *data_1[] = {
         car_down_seq
 };
 }; // namespace SkyCompact
+} // namespace SkyCompact
 #endif

scummvm/sky/compacts/101comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/101comp.h scummvm/sky/compacts/101comp.h

old	new	uint16 s101_chip_list[] = {
882	882	0
883	883	};
884	884
885		}; // namespace SkyCompact
	885	} // namespace SkyCompact
886	886
887	887	#endif

scummvm/sky/compacts/102comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/102comp.h scummvm/sky/compacts/102comp.h

old	new	Compact restart_butt = {
568	568	0
569	569	};
570	570
571		}; // namespace SkyCompact
	571	} // namespace SkyCompact
572	572
573	573	#endif

scummvm/sky/compacts/10comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/10comp.h scummvm/sky/compacts/10comp.h

old	new	Compact liyt_1 = {
2430	2430	0
2431	2431	};
2432	2432
2433		}; // namespace SkyCompact
	2433	} // namespace SkyCompact
2434	2434
2435	2435	#endif

scummvm/sky/compacts/11comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/11comp.h scummvm/sky/compacts/11comp.h

old	new	uint16 cable_fall2_seq[] = {
1725	1725	0
1726	1726	};
1727	1727
1728		}; // namespace SkyCompact
	1728	} // namespace SkyCompact
1729	1729
1730	1730	#endif

scummvm/sky/compacts/12comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/12comp.h scummvm/sky/compacts/12comp.h

old	new	uint16 topbelt_seq[] = {
2227	2227	0
2228	2228	};
2229	2229
2230		}; // namespace SkyCompact
	2230	} // namespace SkyCompact
2231	2231
2232	2232	#endif

scummvm/sky/compacts/13comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/13comp.h scummvm/sky/compacts/13comp.h

old	new	uint16 armsup_seq[] = {
3765	3765	0
3766	3766	};
3767	3767
3768		}; // namespace SkyCompact
	3768	} // namespace SkyCompact
3769	3769
3770	3770	#endif

scummvm/sky/compacts/14comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/14comp.h scummvm/sky/compacts/14comp.h

old	new	uint16 change6_seq[] = {
2073	2073	0
2074	2074	};
2075	2075
2076		}; // namespace SkyCompact
	2076	} // namespace SkyCompact
2077	2077
2078	2078	#endif

scummvm/sky/compacts/15comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/15comp.h scummvm/sky/compacts/15comp.h

old	new	uint16 s15_chip_list[] = {
1106	1106	0
1107	1107	};
1108	1108
1109		}; // namespace SkyCompact
	1109	} // namespace SkyCompact
1110	1110
1111	1111	#endif

scummvm/sky/compacts/16comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/16comp.h scummvm/sky/compacts/16comp.h

old	new	uint16 fost_con_look[] = {
980	980	0
981	981	};
982	982
983		}; // namespace SkyCompact
	983	} // namespace SkyCompact
984	984
985	985	#endif

scummvm/sky/compacts/17comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/17comp.h scummvm/sky/compacts/17comp.h

old	new	Compact pulse = {
914	914	0
915	915	};
916	916
917		}; // namespace SkyCompact
	917	} // namespace SkyCompact
918	918
919	919	#endif

scummvm/sky/compacts/18comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/18comp.h scummvm/sky/compacts/18comp.h

old	new	Compact right_exit_s18 = {
1601	1601	0
1602	1602	};
1603	1603
1604		}; // namespace SkyCompact
	1604	} // namespace SkyCompact
1605	1605
1606	1606	#endif

scummvm/sky/compacts/19comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/19comp.h scummvm/sky/compacts/19comp.h

old	new	uint16 s19_fast_list[] = {
721	721	0
722	722	};
723	723
724		}; // namespace SkyCompact
	724	} // namespace SkyCompact
725	725
726	726	#endif

scummvm/sky/compacts/1compact.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/1compact.h scummvm/sky/compacts/1compact.h

old	new	uint16 fire1_seq[] = {
1972	1972	0
1973	1973	};
1974	1974
1975		}; // namespace SkyCompact
	1975	} // namespace SkyCompact
1976	1976
1977	1977	#endif

scummvm/sky/compacts/20comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/20comp.h scummvm/sky/compacts/20comp.h

-              old
+               uint16 s20_mouse[] = {
         ID_TEXT_MOUSE
 };
 }; // namespace SkyCompact
+} // namespace SkyCompact
 #endif

scummvm/sky/compacts/21comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/21comp.h scummvm/sky/compacts/21comp.h

old	new	uint16 take_cassette_seq[] = {
2142	2142	0
2143	2143	};
2144	2144
2145		}; // namespace SkyCompact
	2145	} // namespace SkyCompact
2146	2146
2147	2147	#endif

scummvm/sky/compacts/22comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/22comp.h scummvm/sky/compacts/22comp.h

old	new	Compact fish_poster = {
1581	1581	0
1582	1582	};
1583	1583
1584		}; // namespace SkyCompact
	1584	} // namespace SkyCompact
1585	1585
1586	1586	#endif

scummvm/sky/compacts/23comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/23comp.h scummvm/sky/compacts/23comp.h

old	new	uint16 rs_foster_29_23[] = {
795	795	65535
796	796	};
797	797
798		}; // namespace SkyCompact
	798	} // namespace SkyCompact
799	799
800	800	#endif

scummvm/sky/compacts/24comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/24comp.h scummvm/sky/compacts/24comp.h

old	new	uint16 s24_fast_list[] = {
1311	1311	0
1312	1312	};
1313	1313
1314		}; // namespace SkyCompact
	1314	} // namespace SkyCompact
1315	1315
1316	1316	#endif

scummvm/sky/compacts/25comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/25comp.h scummvm/sky/compacts/25comp.h

old	new	Compact s25_floor = {
1117	1117	0
1118	1118	};
1119	1119
1120		}; // namespace SkyCompact
	1120	} // namespace SkyCompact
1121	1121
1122	1122	#endif

scummvm/sky/compacts/26comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/26comp.h scummvm/sky/compacts/26comp.h

old	new	Compact s26_floor = {
1303	1303	0
1304	1304	};
1305	1305
1306		}; // namespace SkyCompact
	1306	} // namespace SkyCompact
1307	1307
1308	1308	#endif

scummvm/sky/compacts/27comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/27comp.h scummvm/sky/compacts/27comp.h

old	new	Compact chair_27 = {
3274	3274	0
3275	3275	};
3276	3276
3277		}; // namespace SkyCompact
	3277	} // namespace SkyCompact
3278	3278
3279	3279	#endif

scummvm/sky/compacts/28comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/28comp.h scummvm/sky/compacts/28comp.h

old	new	Compact small_l_28 = {
989	989	0
990	990	};
991	991
992		}; // namespace SkyCompact
	992	} // namespace SkyCompact
993	993
994	994	#endif

scummvm/sky/compacts/29comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/29comp.h scummvm/sky/compacts/29comp.h

-              old
+               void *data_3[] = {
         rs_31_28
 };
 }; // namespace SkyCompact
+} // namespace SkyCompact
 #endif

scummvm/sky/compacts/2compact.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/2compact.h scummvm/sky/compacts/2compact.h

old	new	Compact top_barrel = {
1820	1820	0
1821	1821	};
1822	1822
1823		}; // namespace SkyCompact
	1823	} // namespace SkyCompact
1824	1824
1825	1825	#endif

scummvm/sky/compacts/30comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/30comp.h scummvm/sky/compacts/30comp.h

-              old
+               void *data_4[] = {
         &sc31_at_watcher
 };
 }; // namespace SkyCompact
+} // namespace SkyCompact
 #endif

scummvm/sky/compacts/31comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/31comp.h scummvm/sky/compacts/31comp.h

old	new	uint16 sc31_joey_list[] = {
2850	2850	0
2851	2851	};
2852	2852
2853		}; // namespace SkyCompact
	2853	} // namespace SkyCompact
2854	2854
2855	2855	#endif

scummvm/sky/compacts/32comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/32comp.h scummvm/sky/compacts/32comp.h

old	new	Compact sc32_exit_33 = {
1836	1836	0
1837	1837	};
1838	1838
1839		}; // namespace SkyCompact
	1839	} // namespace SkyCompact
1840	1840
1841	1841	#endif

scummvm/sky/compacts/33comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/33comp.h scummvm/sky/compacts/33comp.h

old	new	uint16 reset_30_33[] = {
824	824	65535
825	825	};
826	826
827		}; // namespace SkyCompact
	827	} // namespace SkyCompact
828	828
829	829	#endif

scummvm/sky/compacts/34comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/34comp.h scummvm/sky/compacts/34comp.h

old	new	Compact sc34_door = {
954	954	0
955	955	};
956	956
957		}; // namespace SkyCompact
	957	} // namespace SkyCompact
958	958
959	959	#endif

scummvm/sky/compacts/36comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/36comp.h scummvm/sky/compacts/36comp.h

old	new	Compact sc36_exit_30 = {
4269	4269	0
4270	4270	};
4271	4271
4272		}; // namespace SkyCompact
	4272	} // namespace SkyCompact
4273	4273
4274	4274	#endif

scummvm/sky/compacts/37comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/37comp.h scummvm/sky/compacts/37comp.h

old	new	uint16 sc37_crbarbox[] = {
1904	1904	0
1905	1905	};
1906	1906
1907		}; // namespace SkyCompact
	1907	} // namespace SkyCompact
1908	1908
1909	1909	#endif

scummvm/sky/compacts/38comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/38comp.h scummvm/sky/compacts/38comp.h

old	new	uint16 sc38_lift_down[] = {
3828	3828	0
3829	3829	};
3830	3830
3831		}; // namespace SkyCompact
	3831	} // namespace SkyCompact
3832	3832
3833	3833	#endif

scummvm/sky/compacts/39comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/39comp.h scummvm/sky/compacts/39comp.h

old	new	uint16 sc39_palette[] = {
774	774	16191
775	775	};
776	776
777		}; // namespace SkyCompact
	777	} // namespace SkyCompact
778	778
779	779	#endif

scummvm/sky/compacts/3compact.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/3compact.h scummvm/sky/compacts/3compact.h

old	new	Compact low_barrel = {
1843	1843	0
1844	1844	};
1845	1845
1846		}; // namespace SkyCompact
	1846	} // namespace SkyCompact
1847	1847
1848	1848	#endif

scummvm/sky/compacts/40comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/40comp.h scummvm/sky/compacts/40comp.h

old	new	uint16 sc40_ascend[] = {
1220	1220	0
1221	1221	};
1222	1222
1223		}; // namespace SkyCompact
	1223	} // namespace SkyCompact
1224	1224
1225	1225	#endif

scummvm/sky/compacts/41comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/41comp.h scummvm/sky/compacts/41comp.h

old	new	uint16 sc41_palette[] = {
744	744	16191
745	745	};
746	746
747		}; // namespace SkyCompact
	747	} // namespace SkyCompact
748	748
749	749	#endif

scummvm/sky/compacts/42comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/42comp.h scummvm/sky/compacts/42comp.h

old	new	uint16 sc42_fos_leave[] = {
1708	1708	0
1709	1709	};
1710	1710
1711		}; // namespace SkyCompact
	1711	} // namespace SkyCompact
1712	1712
1713	1713	#endif

scummvm/sky/compacts/44comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/44comp.h scummvm/sky/compacts/44comp.h

old	new	uint16 reset_37_44[] = {
649	649	65535
650	650	};
651	651
652		}; // namespace SkyCompact
	652	} // namespace SkyCompact
653	653
654	654	#endif

scummvm/sky/compacts/45comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/45comp.h scummvm/sky/compacts/45comp.h

-              old
+               uint16 sc45_mouse_list[] = {
         ID_TEXT_MOUSE
 };
 }; // namespace SkyCompact
+} // namespace SkyCompact
 #endif

scummvm/sky/compacts/46comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/46comp.h scummvm/sky/compacts/46comp.h

old	new	Compact sc46_floor = {
564	564	0
565	565	};
566	566
567		}; // namespace SkyCompact
	567	} // namespace SkyCompact
568	568
569	569	#endif

scummvm/sky/compacts/47comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/47comp.h scummvm/sky/compacts/47comp.h

old	new	Compact sc47_floor = {
578	578	0
579	579	};
580	580
581		}; // namespace SkyCompact
	581	} // namespace SkyCompact
582	582
583	583	#endif

scummvm/sky/compacts/48comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/48comp.h scummvm/sky/compacts/48comp.h

old	new	uint16 sc48_light_pal[] = {
1162	1162	16191
1163	1163	};
1164	1164
1165		}; // namespace SkyCompact
	1165	} // namespace SkyCompact
1166	1166
1167	1167	#endif

scummvm/sky/compacts/4compact.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/4compact.h scummvm/sky/compacts/4compact.h

old	new	Compact cupboard_s4 = {
1346	1346	0
1347	1347	};
1348	1348
1349		}; // namespace SkyCompact
	1349	} // namespace SkyCompact
1350	1350
1351	1351	#endif

scummvm/sky/compacts/5compact.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/5compact.h scummvm/sky/compacts/5compact.h

-              old
+               void *data_2[] = {
 uint32 *table2 = (uint32*)data_2;
 }; // namespace SkyCompact
+} // namespace SkyCompact
 #endif

scummvm/sky/compacts/65comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/65comp.h scummvm/sky/compacts/65comp.h

old	new	uint16 sc65_palette[] = {
671	671	16191
672	672	};
673	673
674		}; // namespace SkyCompact
	674	} // namespace SkyCompact
675	675
676	676	#endif

scummvm/sky/compacts/66comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/66comp.h scummvm/sky/compacts/66comp.h

-              old
+               void *data_5[] = {
         reset_dad_spec
 };
 }; // namespace SkyCompact
+} // namespace SkyCompact
 #endif

scummvm/sky/compacts/67comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/67comp.h scummvm/sky/compacts/67comp.h

old	new	Compact sc67_clot = {
2089	2089	0
2090	2090	};
2091	2091
2092		}; // namespace SkyCompact
	2092	} // namespace SkyCompact
2093	2093
2094	2094	#endif

scummvm/sky/compacts/68comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/68comp.h scummvm/sky/compacts/68comp.h

old	new	uint16 sc68_joey_list[] = {
1409	1409	0
1410	1410	};
1411	1411
1412		}; // namespace SkyCompact
	1412	} // namespace SkyCompact
1413	1413
1414	1414	#endif

scummvm/sky/compacts/69comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/69comp.h scummvm/sky/compacts/69comp.h

old	new	Compact sc69_floor = {
1191	1191	0
1192	1192	};
1193	1193
1194		}; // namespace SkyCompact
	1194	} // namespace SkyCompact
1195	1195
1196	1196	#endif

scummvm/sky/compacts/70comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/70comp.h scummvm/sky/compacts/70comp.h

-              old
+               uint16 sc70_mouse_list[] = {
         ID_TEXT_MOUSE
 };
 }; // namespace SkyCompact
+} // namespace SkyCompact
 #endif

scummvm/sky/compacts/71comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/71comp.h scummvm/sky/compacts/71comp.h

old	new	uint16 sc71_light2_anim[] = {
1700	1700	0
1701	1701	};
1702	1702
1703		}; // namespace SkyCompact
	1703	} // namespace SkyCompact
1704	1704
1705	1705	#endif

scummvm/sky/compacts/72comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/72comp.h scummvm/sky/compacts/72comp.h

old	new	Compact sc72_chamber1 = {
2414	2414	0
2415	2415	};
2416	2416
2417		}; // namespace SkyCompact
	2417	} // namespace SkyCompact
2418	2418
2419	2419	#endif

scummvm/sky/compacts/73comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/73comp.h scummvm/sky/compacts/73comp.h

old	new	Compact sc73_cham4_light = {
2546	2546	0
2547	2547	};
2548	2548
2549		}; // namespace SkyCompact
	2549	} // namespace SkyCompact
2550	2550
2551	2551	#endif

scummvm/sky/compacts/74comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/74comp.h scummvm/sky/compacts/74comp.h

old	new	uint16 sc74_slot_flash[] = {
6681	6681	0
6682	6682	};
6683	6683
6684		}; // namespace SkyCompact
	6684	} // namespace SkyCompact
6685	6685
6686	6686	#endif

scummvm/sky/compacts/75comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/75comp.h scummvm/sky/compacts/75comp.h

old	new	uint16 sc75_get_tiss[] = {
1910	1910	0
1911	1911	};
1912	1912
1913		}; // namespace SkyCompact
	1913	} // namespace SkyCompact
1914	1914
1915	1915	#endif

scummvm/sky/compacts/76comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/76comp.h scummvm/sky/compacts/76comp.h

old	new	Compact sc76_door75 = {
2814	2814	0
2815	2815	};
2816	2816
2817		}; // namespace SkyCompact
	2817	} // namespace SkyCompact
2818	2818
2819	2819	#endif

scummvm/sky/compacts/77comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/77comp.h scummvm/sky/compacts/77comp.h

old	new	Compact sc77_door76 = {
1092	1092	0
1093	1093	};
1094	1094
1095		}; // namespace SkyCompact
	1095	} // namespace SkyCompact
1096	1096
1097	1097	#endif

scummvm/sky/compacts/78comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/78comp.h scummvm/sky/compacts/78comp.h

old	new	uint16 sc78_fast_list[] = {
1204	1204	0
1205	1205	};
1206	1206
1207		}; // namespace SkyCompact
	1207	} // namespace SkyCompact
1208	1208
1209	1209	#endif

scummvm/sky/compacts/79comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/79comp.h scummvm/sky/compacts/79comp.h

old	new	Compact sc79_pipe = {
1655	1655	0
1656	1656	};
1657	1657
1658		}; // namespace SkyCompact
	1658	} // namespace SkyCompact
1659	1659
1660	1660	#endif

scummvm/sky/compacts/80comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/80comp.h scummvm/sky/compacts/80comp.h

old	new	Compact sc80_goo = {
3565	3565	0
3566	3566	};
3567	3567
3568		}; // namespace SkyCompact
	3568	} // namespace SkyCompact
3569	3569
3570	3570	#endif

scummvm/sky/compacts/81comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/81comp.h scummvm/sky/compacts/81comp.h

old	new	uint16 sc81_foster_sit[] = {
2762	2762	0
2763	2763	};
2764	2764
2765		}; // namespace SkyCompact
	2765	} // namespace SkyCompact
2766	2766
2767	2767	#endif

scummvm/sky/compacts/82comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/82comp.h scummvm/sky/compacts/82comp.h

old	new	uint16 sc82_jobs_return[] = {
712	712	0
713	713	};
714	714
715		}; // namespace SkyCompact
	715	} // namespace SkyCompact
716	716
717	717	#endif

scummvm/sky/compacts/85comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/85comp.h scummvm/sky/compacts/85comp.h

-              old
+               uint16 sc85_logic_list[] = {
         ID_STD_MENU_LOGIC
 };
 }; // namespace SkyCompact
+} // namespace SkyCompact
 #endif

scummvm/sky/compacts/90comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/90comp.h scummvm/sky/compacts/90comp.h

-              old
+               void *data_6[] = {
 uint32 *sec6_compacts = (uint32*)data_6;
 }; // namespace SkyCompact
+} // namespace SkyCompact
 #endif

scummvm/sky/compacts/91comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/91comp.h scummvm/sky/compacts/91comp.h

old	new	Compact door_r91f = {
1518	1518	0
1519	1519	};
1520	1520
1521		}; // namespace SkyCompact
	1521	} // namespace SkyCompact
1522	1522
1523	1523	#endif

scummvm/sky/compacts/92comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/92comp.h scummvm/sky/compacts/92comp.h

old	new	Compact slab3 = {
1682	1682	0
1683	1683	};
1684	1684
1685		}; // namespace SkyCompact
	1685	} // namespace SkyCompact
1686	1686
1687	1687	#endif

scummvm/sky/compacts/93comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/93comp.h scummvm/sky/compacts/93comp.h

old	new	uint16 pal93[] = {
834	834	16191
835	835	};
836	836
837		}; // namespace SkyCompact
	837	} // namespace SkyCompact
838	838
839	839	#endif

scummvm/sky/compacts/94comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/94comp.h scummvm/sky/compacts/94comp.h

old	new	Compact hologram_a = {
1377	1377	0
1378	1378	};
1379	1379
1380		}; // namespace SkyCompact
	1380	} // namespace SkyCompact
1381	1381
1382	1382	#endif

scummvm/sky/compacts/95comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/95comp.h scummvm/sky/compacts/95comp.h

old	new	uint16 door_l95_anim[] = {
1357	1357	0
1358	1358	};
1359	1359
1360		}; // namespace SkyCompact
	1360	} // namespace SkyCompact
1361	1361
1362	1362	#endif

scummvm/sky/compacts/96comp.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/96comp.h scummvm/sky/compacts/96comp.h

old	new	uint16 fast_list_sc96[] = {
924	924	0
925	925	};
926	926
927		}; // namespace SkyCompact
	927	} // namespace SkyCompact
928	928
929	929	#endif

scummvm/sky/compacts/9compact.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/9compact.h scummvm/sky/compacts/9compact.h

old	new	uint16 s9_pal[] = {
1689	1689	16191
1690	1690	};
1691	1691
1692		}; // namespace SkyCompact
	1692	} // namespace SkyCompact
1693	1693
1694	1694	#endif

scummvm/sky/compacts/linc_gen.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/linc_gen.h scummvm/sky/compacts/linc_gen.h

-              old
+               uint16 rs_foster_s90[] = {
 uint32 *grid93 = 0;
 }; // namespace SkyCompact
+} // namespace SkyCompact
 #endif

scummvm/sky/compacts/lincmenu.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/lincmenu.h scummvm/sky/compacts/lincmenu.h

old	new	Compact blind_menu = {
798	798	0
799	799	};
800	800
801		}; // namespace SkyCompact
	801	} // namespace SkyCompact
802	802
803	803	#endif

scummvm/sky/compacts/objects.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/objects.h scummvm/sky/compacts/objects.h

old	new	Compact menu_bar = {
1258	1258	0
1259	1259	};
1260	1260
1261		}; // namespace SkyCompact
	1261	} // namespace SkyCompact
1262	1262
1263	1263	#endif

scummvm/sky/compacts/z_compac.h

diff -Nurp -X X.scummvm /cvs/scummvm/sky/compacts/z_compac.h scummvm/sky/compacts/z_compac.h

-              old
+               void *data_0[] = {
 uint32 *z_compact_table = (uint32*)data_0;
 }; // namespace SkyCompact
+} // namespace SkyCompact
 #endif

scummvm/sky/debug.cpp

diff -Nurp -X X.scummvm /cvs/scummvm/sky/debug.cpp scummvm/sky/debug.cpp

old	new	void SkyDebug::script(uint32 command, ui
1260	1260
1261	1261	void SkyDebug::mcode(uint32 mcode, uint32 a, uint32 b, uint32 c) {
1262	1262	debug(6, "MCODE: %s(%d, %d, %d)", mcodes[mcode], a, b, c);
1263		};
	1263	}
1264	1264

scummvm/sky/logic.cpp

diff -Nurp -X X.scummvm /cvs/scummvm/sky/logic.cpp scummvm/sky/logic.cpp

-              old
+               uint16 SkyLogic::mouseScript(uint32 scrN
         uint16 retVal = script((uint16)(scrNum & 0xFFFF), (uint16)(scrNum >> 16));
         _compact = tmpComp;
         return retVal;
 };
+}
 /**
  * This is the actual script engine.  It interprets script \a scriptNo starting at \a offset

Context Navigation

Ticket #8273: scummvm-compile-fix.patch

Download in other formats: