(svn r15504) -Fix: today is Friday 13th, right?

(svn r15503) -Fix: svn:externals didn't do what I wanted it to do, even though it is documented to do what I wanted it to do. Lets hope this one works as I want it to.
(svn r15502) -Release 0.7.0-beta1. Many new features, small and big. Happy testing!
2026-07-21 10:09:42 +00:00 · 2009-02-16 22:59:15 +00:00 · 2009-02-16 22:01:31 +00:00 · 2009-02-16 21:59:33 +00:00
621 changed files with 20865 additions and 50484 deletions
@@ -1,7 +1,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = OpenTTD
+PROJECT_NAME           = openttd
 OUTPUT_DIRECTORY       = docs/source/
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
@@ -36,6 +36,8 @@ bundle: all
 	$(Q)rm -rf   "$(BUNDLE_DIR)"
 	$(Q)mkdir -p "$(BUNDLE_DIR)"
 	$(Q)mkdir -p "$(BUNDLE_DIR)/docs"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario/heightmap"
 	$(Q)mkdir -p "$(BUNDLE_DIR)/media"
 	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
 	$(Q)mkdir -p "$(TTD_DIR)"
@@ -73,6 +75,12 @@ ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
 	$(Q)cat "$(ROOT_DIR)/media/openttd.desktop" | sed s/=openttd/=$(BINARY_NAME)/g > "$(ROOT_DIR)/media/openttd.desktop.install"
 endif
+ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/\"*.scn 2> /dev/null`"; then echo 1; fi), 1)
+	$(Q)cp "$(BIN_DIR)/scenario/"*.scn        "$(BUNDLE_DIR)/scenario/"
+endif
+ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/heightmaps/\"* 2>/dev/null`"; then echo 1; fi), 1)
+	$(Q)cp "$(BIN_DIR)/scenario/heightmaps/"* "$(BUNDLE_DIR)/scenario/heightmap/"
+endif
 ifeq ($(TTD), openttd.exe)
 	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
 ifeq ($(OS), DOS)
@@ -180,4 +188,5 @@ ifdef MENU_DIR
 	$(Q)install -d "$(INSTALL_MENU_DIR)"
 	$(Q)install -m 644 "$(ROOT_DIR)/media/openttd.desktop.install" "$(INSTALL_MENU_DIR)/${BINARY_NAME}.desktop"
 endif
+	$(Q)cp -R "$(BUNDLE_DIR)/scenario" "$(INSTALL_DATA_DIR)"
 endif # OSXAPP
@@ -93,7 +93,7 @@ ifeq ($(shell if test -f config.cache; then echo 1; fi), 1)
 	@echo " Going to reconfigure with last known settings..."
 	@echo "----------------"
 # Make sure we don't lock config.cache
-	@$(shell cat config.cache | sed 's@\\ @\\\\ @g') || exit 1
+	@$(shell cat config.cache | sed 's~\\ ~\\\\ ~g') || exit 1
 	@echo "----------------"
 	@echo "Reconfig done. Please re-execute make."
 	@echo "----------------"
@@ -19,8 +19,8 @@ BIN_DIR = "$(ROOT_DIR)/bin"
 SRC_DIR = "$(ROOT_DIR)/src"
 BUNDLE_DIR = "$(ROOT_DIR)/bundle"
 BUNDLES_DIR = "$(ROOT_DIR)/bundles"
-TTD = openttd.exe
-TARGET := $(shell echo $(PLATFORM) | sed "s@win64@x64@;s@win32@Win32@")
+TTD = "openttd.exe"
+TARGET := $(shell echo $(PLATFORM) | sed "s~win64~x64~;s~win32~Win32~")

 all:
 	$(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD)
@@ -4,6 +4,7 @@ CC_BUILD     = !!CC_BUILD!!
 CXX_BUILD    = !!CXX_BUILD!!
 WINDRES      = !!WINDRES!!
 STRIP        = !!STRIP!!
+CC_CFLAGS    = !!CC_CFLAGS!!
 CFLAGS       = !!CFLAGS!!
 CFLAGS_BUILD = !!CFLAGS_BUILD!!
 LIBS         = !!LIBS!!
@@ -27,6 +28,7 @@ CFLAGS_MAKEDEP= !!CFLAGS_MAKEDEP!!
 SORT         = !!SORT!!
 REVISION     = !!REVISION!!
 AWK          = !!AWK!!
+GCC295       = !!GCC295!!
 CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!!
 CONFIG_CACHE_LINKER   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!!
 CONFIG_CACHE_ENDIAN   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_ENDIAN!!
@@ -51,6 +53,20 @@ CFLAGS_MAKEDEP += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR) -I $(SCRIPT_SRC_DIR)

 ENDIAN_TARGETS := endian_target.h $(ENDIAN_CHECK)

+# This 'sed' basicly just removes 'const' from the line if it is a 2+D array
+# For more information, please check:
+#  http://maillist.openttd.org/pipermail/devs/2007-April/000284.html
+#  http://maillist.openttd.org/pipermail/devs/2007-February/000248.html
+GCC295_FIX=sed -r 's~^(\t*)(.*)( const )([A-Za-z0-9_ ]+(\[.*\]){2,})(( = \{)|(;))(.*)$$~\1\2 \4\6\8\9~g'
+# This 'sed' removes the 3rd '4' in the # lines of the -E output of
+#  gcc 2.95.3 and lower, as it should indicate that it is a C-linkage, but the
+#  compiler can't handle that information (just don't ask). So we remove it
+#  and then it compiles happily and without bitching :)
+# Furthermore gcc 2.95 has some trouble with protected and private when
+#  accessing the protected/private stuff of the enclosing class (or the
+#  super class of the enclosing class).
+GCC295_FIX_2=sed -e 's~\(^\# [0-9][0-9]* "[^"]*"[ 0-9]*\) 4$$~\1~g;s~private:~public:~g;s~protected:~public:~g'
+
 # Check if we want to show what we are doing
 ifdef VERBOSE
 	Q =
@@ -82,7 +98,7 @@ MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3 -d'	')
 ifdef REVISION
 # Use specified revision (which should be of the form "r000").
 REV := $(REVISION)
-REV_NR := $(shell echo $(REVISION) | sed "s@[^0-9]@@g")
+REV_NR := $(shell echo $(REVISION) | sed "s~[^0-9]~~g")
 else
 # Use autodetected revisions
 REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
@@ -98,7 +114,7 @@ REV_NR := 0
 endif

 # This helps to recompile if flags change
-RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CFLAGS)" ]; then echo "$(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CC_CFLAGS) $(CFLAGS)" ]; then echo "$(CC_CFLAGS) $(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
 RES := $(shell if [ "`cat $(CONFIG_CACHE_LINKER) 2>/dev/null`" != "$(LDFLAGS) $(LIBS)" ]; then echo "$(LDFLAGS) $(LIBS)" > $(CONFIG_CACHE_LINKER); fi )
 RES := $(shell if [ "`cat $(CONFIG_CACHE_ENDIAN) 2>/dev/null`" != "$(ENDIAN_FORCE)" ]; then echo "$(ENDIAN_FORCE)" > $(CONFIG_CACHE_ENDIAN); fi )

@@ -127,15 +143,15 @@ endif

 $(OBJS_C:%.o=%.d): %.d: $(SRC_DIR)/%.c $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.c=%.c)'
-	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
+	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -MM $< | sed 's~^$(@F:%.d=%.o):~$@ $(@:%.d=%.o):~' > $@

 $(OBJS_CPP:%.o=%.d): %.d: $(SRC_DIR)/%.cpp $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
+	$(Q)$(CXX_HOST) $(CFLAGS) -MM $< | sed 's~^$(@F:%.d=%.o):~$@ $(@:%.d=%.o):~' > $@

 $(OBJS_MM:%.o=%.d): %.d: $(SRC_DIR)/%.mm $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'
-	$(Q)$(CC_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
+	$(Q)$(CC_HOST) $(CFLAGS) -MM $< | sed 's~^$(@F:%.d=%.o):~$@ $(@:%.d=%.o):~' > $@

 $(OBJS_RC:%.o=%.d): %.d: $(SRC_DIR)/%.rc $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'
@@ -166,7 +182,7 @@ endif

 # Convert x:/... paths to /x/... for mingw
 ifeq ($(OS), MINGW)
-	@cat Makefile.dep.tmp | sed 's@/\([a-zA-Z]\):\/@\/\1\/@g' > Makefile.dep.tmp.mingw
+	@cat Makefile.dep.tmp | sed 's~\([a-zA-Z]\):\/~\/\1\/~g' > Makefile.dep.tmp.mingw
 	@cp Makefile.dep.tmp.mingw Makefile.dep.tmp
 	@rm -f Makefile.dep.tmp.mingw
 endif
@@ -176,7 +192,7 @@ endif
 	@$(AWK) '                           \
 	/^# DO NOT/ { print $$0 ; next}     \
 	/^#/ {next}                         \
-	/: / {                               \
+	/:/ {                               \
 		left = NF - 1;                    \
 		for (n = 2; n <= NF; n++) {       \
 			if (match($$n, "^$(ROOT_DIR)") == 0) { \
@@ -195,7 +211,7 @@ endif
 	{                                   \
 		print $$0                         \
 	}                                   \
-	' < Makefile.dep.tmp | sed 's@  *@ @g;s@ $$@@' | $(SORT) > Makefile.dep
+	' < Makefile.dep.tmp | sed 's~  *~ ~g;s~ $$~~' | $(SORT) > Makefile.dep

 	$(Q)rm -f Makefile.dep.tmp Makefile.dep.tmp.bak

@@ -210,9 +226,17 @@ endif

 # Compile all the files according to the targets

+$(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP)
+	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'
+	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -c -o $@ $<
+
 $(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
+ifeq ($(GCC295), 1)
+	$(Q)$(CXX_HOST) -E $(CFLAGS) $< | $(GCC295_FIX) | $(GCC295_FIX_2) | $(CXX_HOST) $(CFLAGS) -c -o $@ -x c++ -
+else
 	$(Q)$(CXX_HOST) $(CFLAGS) -c -o $@ $<
+endif

 $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
@@ -256,10 +280,10 @@ $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 # Revision files

 $(SRC_DIR)/rev.cpp: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/rev.cpp.in
-	$(Q)cat $(SRC_DIR)/rev.cpp.in      | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!MODIFIED!!@$(MODIFIED)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/rev.cpp
+	$(Q)cat $(SRC_DIR)/rev.cpp.in      | sed "s~@@REVISION@@~$(REV_NR)~g;s~@@VERSION@@~$(REV)~g;s~@@MODIFIED@@~$(MODIFIED)~g;s~@@DATE@@~`date +%d.%m.%y`~g" > $(SRC_DIR)/rev.cpp

 $(SRC_DIR)/ottdres.rc: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/ottdres.rc.in
-	$(Q)cat $(SRC_DIR)/ottdres.rc.in | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/ottdres.rc
+	$(Q)cat $(SRC_DIR)/ottdres.rc.in | sed "s~@@REVISION@@~$(REV_NR)~g;s~@@VERSION@@~$(REV)~g;s~@@DATE@@~`date +%d.%m.%y`~g" > $(SRC_DIR)/ottdres.rc

 FORCE:

@@ -58,7 +58,7 @@ function Regression::TestInit()
 	}

 	list = AIList();
-	list.Sort(AIAbstractList.SORT_BY_VALUE, AIAbstractList.SORT_ASCENDING);
+	list.Sort(AIAbstractList.SORT_BY_VALUE, true);
 	print("");
 	print(" Value Ascending");
 	list.AddItem( 5, 10);
@@ -93,7 +93,7 @@ function Regression::TestInit()
 	}

 	list = AIList();
-	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_DESCENDING);
+	list.Sort(AIAbstractList.SORT_BY_ITEM, false);
 	print("");
 	print(" Item Descending");
 	list.AddItem( 5, 10);
@@ -128,7 +128,7 @@ function Regression::TestInit()
 	}

 	list = AIList();
-	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
+	list.Sort(AIAbstractList.SORT_BY_ITEM, true);
 	print("");
 	print(" Item Ascending");
 	list.AddItem( 5, 10);
@@ -213,15 +213,13 @@ function Regression::Airport()
 	print("  GetAirportType():     " + AIAirport.GetAirportType(32116));

 	for (local i = -1; i < 10; i++) {
-		print("  IsAirportInformationAvailable(" + i + "): " + AIAirport.IsAirportInformationAvailable(i));
-		print("  IsValidAirportType(" + i + "):            " + AIAirport.IsValidAirportType(i));
-		print("  GetAirportWidth(" + i + "):               " + AIAirport.GetAirportWidth(i));
-		print("  GetAirportHeight(" + i + "):              " + AIAirport.GetAirportHeight(i));
-		print("  GetAirportCoverageRadius(" + i + "):      " + AIAirport.GetAirportCoverageRadius(i));
+		print("  IsValidAirportType(" + i + "):       " + AIAirport.IsValidAirportType(i));
+		print("  GetAirportWidth(" + i + "):          " + AIAirport.GetAirportWidth(i));
+		print("  GetAirportHeight(" + i + "):         " + AIAirport.GetAirportHeight(i));
+		print("  GetAirportCoverageRadius(" + i + "): " + AIAirport.GetAirportCoverageRadius(i));
 	}

 	print("  GetBankBalance():     " + AICompany.GetBankBalance(AICompany.COMPANY_SELF));
-	print("  GetPrice():           " + AIAirport.GetPrice(0));
 	print("  BuildAirport():       " + AIAirport.BuildAirport(32116, 0, AIStation.STATION_JOIN_ADJACENT));
 	print("  IsHangarTile():       " + AIAirport.IsHangarTile(32116));
 	print("  IsAirportTile():      " + AIAirport.IsAirportTile(32116));
@@ -258,15 +256,12 @@ function Regression::Bridge()
 	print("  Valid Bridges:        " + j);

 	print("  IsBridgeTile():       " + AIBridge.IsBridgeTile(33160));
-	print("  GetBridgeID():        " + AIBridge.GetBridgeID(33160));
 	print("  RemoveBridge():       " + AIBridge.RemoveBridge(33155));
 	print("  GetLastErrorString(): " + AIError.GetLastErrorString());
 	print("  GetOtherBridgeEnd():  " + AIBridge.GetOtherBridgeEnd(33160));
 	print("  BuildBridge():        " + AIBridge.BuildBridge(AIVehicle.VT_ROAD, 5, 33160, 33155));
 	print("  IsBridgeTile():       " + AIBridge.IsBridgeTile(33160));
-	print("  GetBridgeID():        " + AIBridge.GetBridgeID(33160));
 	print("  IsBridgeTile():       " + AIBridge.IsBridgeTile(33155));
-	print("  GetBridgeID():        " + AIBridge.GetBridgeID(33155));
 	print("  GetOtherBridgeEnd():  " + AIBridge.GetOtherBridgeEnd(33160));
 	print("  BuildBridge():        " + AIBridge.BuildBridge(AIVehicle.VT_ROAD, 5, 33160, 33155));
 	print("  GetLastErrorString(): " + AIError.GetLastErrorString());
@@ -334,7 +329,6 @@ function Regression::Cargo()
 		print("    GetCargoIncome(10, 10):  " + AICargo.GetCargoIncome(i, 10, 10));
 		print("    GetCargoIncome(100, 10): " + AICargo.GetCargoIncome(i, 100, 10));
 		print("    GetCargoIncome(10, 100): " + AICargo.GetCargoIncome(i, 10, 100));
-		print("    GetRoadVehicleTypeForCargo(): " + AIRoad.GetRoadVehicleTypeForCargo(i));
 	}
 }

@@ -459,9 +453,6 @@ function Regression::Engine()
 		print("    GetPrice():         " + AIEngine.GetPrice(i));
 		print("    GetMaxAge():        " + AIEngine.GetMaxAge(i));
 		print("    GetRunningCost():   " + AIEngine.GetRunningCost(i));
-		print("    GetPower():         " + AIEngine.GetPower(i));
-		print("    GetWeight():        " + AIEngine.GetWeight(i));
-		print("    GetMaxTractiveEffort(): " + AIEngine.GetMaxTractiveEffort(i));
 		print("    GetVehicleType():   " + AIEngine.GetVehicleType(i));
 		print("    GetRailType():      " + AIEngine.GetRailType(i));
 		print("    GetRoadType():      " + AIEngine.GetRoadType(i));
@@ -544,10 +535,9 @@ function Regression::Industry()

 	print("");
 	print("--Industry--");
+	print("  GetMaxIndustryID():  " + AIIndustry.GetMaxIndustryID());
 	print("  GetIndustryCount():  " + AIIndustry.GetIndustryCount());
-	local list = AIIndustryList();
-	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
-	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
+	for (local i = -1; i < AIIndustry.GetMaxIndustryID() + 1; i++) {
 		if (AIIndustry.IsValidIndustry(i)) j++;
 		print("  Industry " + i);
 		print("    IsValidIndustry(): " + AIIndustry.IsValidIndustry(i));
@@ -637,9 +627,6 @@ function Regression::IndustryTypeList()
 		print("    GetName():               " + AIIndustryType.GetName(i));
 		print("    CanBuildIndustry():      " + AIIndustryType.CanBuildIndustry(i));
 		print("    CanProspectIndustry():   " + AIIndustryType.CanProspectIndustry(i));
-		print("    IsBuiltOnWater():        " + AIIndustryType.IsBuiltOnWater(i));
-		print("    HasHeliport():           " + AIIndustryType.HasHeliport(i));
-		print("    HasDock():               " + AIIndustryType.HasDock(i));
 	}
 }

@@ -668,7 +655,7 @@ function Regression::List()
 	print("  HasItem(1050): " + list.HasItem(1050));
 	print("  HasItem(1051): " + list.HasItem(1051));
 	print("  IsEmpty():     " + list.IsEmpty());
-	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
+	list.Sort(AIAbstractList.SORT_BY_ITEM, true);
 	print("  List Dump:");
 	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    " + i + " => " + list.GetValue(i));
@@ -835,7 +822,7 @@ function Regression::Order()
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(12));
 	print("  IsValidVehicleOrder(): " + AIOrder.IsValidVehicleOrder(12, 1));
 	print("  RemoveOrder():         " + AIOrder.RemoveOrder(12, 0));
-	print("  SetOrderFlags():       " + AIOrder.SetOrderFlags(12, 0, AIOrder.AIOF_FULL_LOAD));
+	print("  ChangeOrder():         " + AIOrder.ChangeOrder(12, 0, AIOrder.AIOF_FULL_LOAD));
 	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(12, 0));
 	print("  CopyOrders():          " + AIOrder.CopyOrders(12, 1));
 	print("  CopyOrders():          " + AIOrder.CopyOrders(13, 12));
@@ -1078,10 +1065,9 @@ function Regression::Sign()
 	print("  BuildSign(33409, 'Some other Sign'): " + sign_id);
 	print("  RemoveSign(" + sign_id + "):                       " + AISign.RemoveSign(sign_id));
 	print("");
-	local list = AISignList();
-	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
-	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
-		j++;
+	print("  GetMaxSignID():    " + AISign.GetMaxSignID());
+	for (local i = -1; i < AISign.GetMaxSignID() + 1; i++) {
+		if (AISign.IsValidSign(i)) j++;
 		print("  Sign " + i);
 		print("    IsValidSign():   " + AISign.IsValidSign(i));
 		print("    GetName():       " + AISign.GetName(i));
@@ -1192,7 +1178,7 @@ function Regression::TileList()
 	print("");
 	print("--TileList--");
 	print("  Count():             " + list.Count());
-	list.AddRectangle(34436, 256 * 2 + 34436 + 8);
+	list.AddRectangle(41895 - 256 * 2, 256 * 2 + 41895 + 8);
 	print("  Count():             " + list.Count());

 	list.Valuate(AITile.GetHeight);
@@ -1203,30 +1189,6 @@ function Regression::TileList()
 		print("    " + i + " => " + list.GetValue(i));
 	}

-	list.Valuate(AITile.GetCornerHeight, AITile.CORNER_N);
-	print("  CornerHeight(North): done");
-	print("  Count():             " + list.Count());
-	print("  ListDump:");
-	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-
-	list.Valuate(AITile.GetMinHeight);
-	print("  MinHeight():         done");
-	print("  Count():             " + list.Count());
-	print("  ListDump:");
-	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-
-	list.Valuate(AITile.GetMaxHeight);
-	print("  MaxHeight():         done");
-	print("  Count():             " + list.Count());
-	print("  ListDump:");
-	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
-		print("    " + i + " => " + list.GetValue(i));
-	}
-
 	list.Valuate(AITile.GetSlope);
 	list.KeepValue(0);
 	print("  Slope():             done");
@@ -1237,8 +1199,6 @@ function Regression::TileList()
 		print("    " + i + " => " + list.GetValue(i));
 	}

-	list.Clear();
-	list.AddRectangle(41895 - 256 * 2, 256 * 2 + 41895 + 8);
 	list.Valuate(AITile.IsBuildable);
 	list.KeepValue(1);
 	print("  Buildable():         done");
@@ -1348,7 +1308,7 @@ function Regression::Town()
 	print("--Town--");
 	print("  GetTownCount():    " + AITown.GetTownCount());
 	local list = AITownList();
-	list.Sort(AIAbstractList.SORT_BY_ITEM, AIAbstractList.SORT_ASCENDING);
+	list.Sort(AIAbstractList.SORT_BY_ITEM, true);
 	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		if (AITown.IsValidTown(i)) j++;
 		print("  Town " + i);
@@ -24,7 +24,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTDD.GRF = 2e1f3667175e8eeb013ea35881ecffb7
+OPENTTDD.GRF = c886c7d5b38a93f2cb1cdc0d33472eb8

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
@@ -24,7 +24,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTDD.GRF = 2e1f3667175e8eeb013ea35881ecffb7
+OPENTTDD.GRF = c886c7d5b38a93f2cb1cdc0d33472eb8

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
@@ -1,7 +1,7 @@
 ; $Id$
 ;
 ; This represents the original graphics as on the Transport
-; Tycoon Deluxe for Windows CD.
+; Tycoon Deluxe for Windows.
 ;
 [metadata]
 name         = original_windows
@@ -24,7 +24,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTDW.GRF = a73ff4dce8936fadc02dea183afad638
+OPENTTDW.GRF = b6689105405fa3ea34cb8a5543633d29

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
@@ -0,0 +1,4 @@
+You can place you scenarios in this dir.
+
+This file is really here to make the Makefile happy, it should be modified to
+properly handle scenarios (or maybe even not at all...).
@@ -5,7 +5,7 @@ log() {
 }

 set_default() {
-	released_version=""
+	released_version="0.7.0-beta1"

 	ignore_extra_parameters="0"
 	# We set all kinds of defaults for params. Later on the user can override
@@ -71,7 +71,6 @@ set_default() {
 	with_freetype="1"
 	with_fontconfig="1"
 	with_icu="1"
-	static_icu="0"
 	with_psp_config="1"
 	with_threads="1"
 	with_distcc="1"
@@ -138,7 +137,6 @@ set_default() {
 		with_freetype
 		with_fontconfig
 		with_icu
-		static_icu
 		with_psp_config
 		with_threads
 		with_distcc
@@ -336,10 +334,6 @@ detect_params() {
 			--with-libicu)                with_icu="2";;
 			--without-libicu)             with_icu="0";;
 			--with-libicu=*)              with_icu="$optarg";;
-			--static-icu)                 static_icu="1";;
-			--static-icu=*)               static_icu="$optarg";;
-			--static-libicu)              static_icu="1";;
-			--static-libicu=*)            static_icu="$optarg";;

 			--with-psp-config)            with_psp_config="2";;
 			--without-psp-config)         with_psp_config="0";;
@@ -421,7 +415,7 @@ save_params() {
 	configure="$CONFIGURE_EXECUTABLE --ignore-extra-parameters"
 	for p in $save_params_array; do
 		eval "v=\"\$$p\""
-		p=`echo "$p" | sed 's@_@-@g;s@\n@@g;s@ @\\ @g'`
+		p=`echo "$p" | sed 's~_~-~g;s~\n~~g;s~ ~\\ ~g'`
 		# Only save those params that aren't empty
 		configure="$configure --$p=\"$v\""
 	done
@@ -821,7 +815,6 @@ check_params() {
 	fi

 	if [ "$os" = "OSX" ]; then
-		check_osx_sdk
 		# Test on G5

 		if [ "$enable_osx_g5" != "0" ]; then
@@ -910,7 +903,7 @@ check_params() {
 			doc_dir="$data_dir/docs"
 		fi
 	else
-		doc_dir="`echo $doc_dir | sed 's@\([^\]\)\\\\ @\1\\\\\\\\ @g;s@\([^\]\) @\1\\\\\\\\ @g'`"
+		doc_dir="`echo $doc_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
 	fi

 	if [ "$icon_theme_dir" = "1" ]; then
@@ -920,7 +913,7 @@ check_params() {
 			icon_theme_dir=""
 		fi
 	else
-		icon_theme_dir="`echo $icon_theme_dir | sed 's@\([^\]\)\\\\ @\1\\\\\\\\ @g;s@\([^\]\) @\1\\\\\\\\ @g'`"
+		icon_theme_dir="`echo $icon_theme_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
 	fi

 	if [ "$personal_dir" = "1" ]; then
@@ -932,7 +925,7 @@ check_params() {
 			personal_dir=".openttd"
 		fi
 	else
-		personal_dir="`echo $personal_dir | sed 's@\([^\]\)\\\\ @\1\\\\\\\\ @g;s@\([^\]\) @\1\\\\\\\\ @g'`"
+		personal_dir="`echo $personal_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
 	fi

 	if [ "$shared_dir" = "1" ]; then
@@ -943,7 +936,7 @@ check_params() {
 			shared_dir=""
 		fi
 	else
-		shared_dir="`echo $shared_dir | sed 's@\([^\]\)\\\\ @\1\\\\\\\\ @g;s@\([^\]\) @\1\\\\\\\\ @g'`"
+		shared_dir="`echo $shared_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
 	fi

 	if [ "$man_dir" = "1" ]; then
@@ -954,7 +947,7 @@ check_params() {
 			man_dir=""
 		fi
 	else
-		man_dir="`echo $man_dir | sed 's@\([^\]\)\\\\ @\1\\\\\\\\ @g;s@\([^\]\) @\1\\\\\\\\ @g'`"
+		man_dir="`echo $man_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
 	fi

 	if [ "$menu_dir" = "1" ]; then
@@ -965,7 +958,7 @@ check_params() {
 			menu_dir=""
 		fi
 	else
-		menu_dir="`echo $menu_dir | sed 's@\([^\]\)\\\\ @\1\\\\\\\\ @g;s@\([^\]\) @\1\\\\\\\\ @g'`"
+		menu_dir="`echo $menu_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
 	fi

 	# "set_universal_binary_flags" needs to be before "detect_iconv"
@@ -1015,74 +1008,13 @@ check_params() {
 	fi
 }

-make_compiler_cflags() {
-	# Params:
-	# $1 - compiler
-	# $2 - the current cflags
-	# $3 - variable to finally write to
-
-	flags="$2"
-
-	if [ `echo $1 | cut -c 1-3` = "icc" ]; then
-		# Enable some things only for certain ICC versions
-		cc_version=`$1 -dumpversion | cut -c 1-4`
-
-
-		if [ "$cc_version" = "10.1" ]; then
-			flags="$flags -Wno-multichar"
-		fi
-
-		if [ "$cc_version" = "11.0" ]; then
-			# warning 1899: multicharacter character literal (potential portability problem) (e.g. 'FOOD')
-			# vec report defaults to telling where it did loop vectorisation, which is not very important
-			flags="$flags -vec-report=0 -wd1899"
-		fi
-	else
-		# Enable some things only for certain GCC versions
-		cc_version=`$1 -dumpversion | cut -c 1,3`
-
-		if [ $cc_version -lt 30 ]; then
-			log 1 "configure: error: gcc older than 3.0 can't compile OpenTTD because of its poor template support"
-			exit 1
-		fi
-
-		flags="$flags -Wall -Wno-multichar -Wsign-compare -Wundef"
-		flags="$flags -Wwrite-strings -Wpointer-arith"
-		flags="$flags -Wno-uninitialized"
-
-		flags="$flags -W -Wno-unused-parameter -Wformat=2"
-		flags="$flags -Wredundant-decls"
-
-		if [ $enable_assert -eq 0 ]; then
-			# Do not warn about unused variables when building without asserts
-			flags="$flags -Wno-unused-variable"
-		fi
-
-		if [ $cc_version -ge 40 ]; then
-			# GCC 4.0+ complains about that we break strict-aliasing.
-			#  On most places we don't see how to fix it, and it doesn't
-			#  break anything. So disable strict-aliasing to make the
-			#  compiler all happy.
-			flags="$flags -fno-strict-aliasing"
-		fi
-
-		if [ $cc_version -ge 42 ]; then
-			# GCC 4.2+ automatically assumes that signed overflows do
-			# not occur in signed arithmetics, whereas we are not
-			# sure that they will not happen. It furthermore complains
-			# about it's own optimized code in some places.
-			flags="$flags -fno-strict-overflow"
-		fi
-	fi
-
-	eval "$3=\"$flags\""
-}
-
 make_cflags_and_ldflags() {
 	# General CFlags for BUILD
 	CFLAGS_BUILD=""
 	# General CFlags for HOST
 	CFLAGS="$CFLAGS -D$os"
+	# CFlags for HOST and C-Compiler
+	CC_FLAGS=""
 	# Libs to compile. In fact this is just LDFLAGS
 	LIBS="-lstdc++"
 	# LDFLAGS used for HOST
@@ -1131,16 +1063,58 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS -DNO_THREADS"
 	fi

-	make_compiler_cflags "$cc_build" "$CFLAGS_BUILD" "CFLAGS_BUILD"
-	make_compiler_cflags "$cc_host" "$CFLAGS" "CFLAGS"
+	if [ `echo $cc_host | cut -c 1-3` = "icc" ]; then
+		# Enable some things only for certain ICC versions
+		cc_version=`$cc_host -dumpversion | cut -c 1-4`
+
+
+		if [ "$cc_version" = "10.1" ]; then
+			CFLAGS="$CFLAGS -Wno-multichar"
+		fi
+	else
+		# Enable some things only for certain GCC versions
+		cc_version=`$cc_host -dumpversion | cut -c 1,3`
+
+		if [ $cc_version -ge 29 ]; then
+			CFLAGS="$CFLAGS -Wall -Wno-multichar -Wsign-compare -Wundef"
+			CFLAGS="$CFLAGS -Wwrite-strings -Wpointer-arith"
+			CFLAGS="$CFLAGS -Wno-uninitialized"
+
+			CC_CFLAGS="$CC_CFLAGS -Wstrict-prototypes"
+		fi
+
+		gcc295=""
+		if [ "$cc_version" = 29 ]; then
+			# Make sure we mark GCC 2.95 flag for Makefile.src.in, as we
+			#  need a lovely hack there to make it compile correctly.
+			gcc295="1"
+
+			# Disable warnings about unused variables when
+			# compiling with asserts disabled
+			if [ $enable_assert -eq 0 ]; then
+				CFLAGS="$CFLAGS -Wno-unused"
+			fi
+		fi
+
+		if [ $cc_version -ge 30 ]; then
+			CFLAGS="$CFLAGS -W -Wno-unused-parameter -Wformat=2"
+			CFLAGS="$CFLAGS -Wredundant-decls"
+			# Do not warn about unused variables when building without asserts
+			if [ $enable_assert -eq 0 ]; then
+				CFLAGS="$CFLAGS -Wno-unused-variable"
+			fi
+		fi
+
+		if [ $cc_version -ge 34 ]; then
+			CC_CFLAGS="$CC_CFLAGS -Wdeclaration-after-statement -Wold-style-definition"
+		fi

-	if [ "`echo $1 | cut -c 1-3`" != "icc" ]; then
 		if [ "$os" = "CYGWIN" ]; then
-			flags="$flags -mwin32"
+			CFLAGS="$CFLAGS -mwin32"
 			LDFLAGS="$LDFLAGS -mwin32"
 		fi
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
-			flags="$flags -mno-cygwin"
+			CFLAGS="$CFLAGS -mno-cygwin"
 			LDFLAGS="$LDFLAGS -mno-cygwin"
 		fi

@@ -1148,6 +1122,22 @@ make_cflags_and_ldflags() {
 			LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
 			LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"
 		fi
+
+		# GCC 4.0+ complains about that we break strict-aliasing.
+		#  On most places we don't see how to fix it, and it doesn't
+		#  break anything. So disable strict-aliasing to make the
+		#  compiler all happy.
+		if [ $cc_version -ge 40 ]; then
+			CFLAGS="$CFLAGS -fno-strict-aliasing"
+		fi
+
+		# GCC 4.2+ automatically assumes that signed overflows do
+		# not occur in signed arithmetics, whereas we are not
+		# sure that they will not happen. It furthermore complains
+		# about it's own optimized code in some places.
+		if [ $cc_version -ge 42 ]; then
+			CFLAGS="$CFLAGS -fno-strict-overflow"
+		fi
 	fi

 	if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
@@ -1216,7 +1206,7 @@ make_cflags_and_ldflags() {
 	if [ -n "$sdl_config" ]; then
 		CFLAGS="$CFLAGS -DWITH_SDL"
 		# SDL must not add _GNU_SOURCE as it breaks many platforms
-		CFLAGS="$CFLAGS `$sdl_config --cflags | sed 's@-D_GNU_SOURCE[^ ]*@@'`"
+		CFLAGS="$CFLAGS `$sdl_config --cflags | sed 's~-D_GNU_SOURCE[^ ]*~~'`"
 		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then
 			if [ "$enable_static" != "0" ]; then
 				LIBS="$LIBS `$sdl_config --static-libs`"
@@ -1278,7 +1268,7 @@ make_cflags_and_ldflags() {
 			if [ "$os" = "OSX" ]; then
 				# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
 				# Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps
-				LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s@-lfontconfig@@`"
+				LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s~-lfontconfig~~`"
 			else
 				LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' '  '`"
 			fi
@@ -1307,12 +1297,7 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS -DWITH_ICU"
 		CFLAGS="$CFLAGS `$icu_config --cppflags | tr '\n\r' '  '`"

-		# Some icu-configs have the 'feature' of not adding a space where others do add the space
-		if [ "$static_icu" != "0" ]; then
-			LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' '  ' | sed s/licu/lsicu/g`"
-		else
-			LIBS="$LIBS `$icu_config --ldflags-searchpath` `$icu_config --ldflags-libsonly | tr '\n\r' '  '`"
-		fi
+		LIBS="$LIBS `$icu_config --ldflags-libsonly | tr '\n\r' '  '`"
 	fi


@@ -1393,7 +1378,7 @@ make_cflags_and_ldflags() {
 	fi

 	if [ "$enable_osx_g5" != "0" ]; then
-		CFLAGS="$CFLAGS -mcpu=G5 -mpowerpc64 -mtune=970 -mcpu=970 -mpowerpc-gpopt"
+		CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt"
 	fi

 	if [ -n "$personal_dir" ]; then
@@ -1406,7 +1391,7 @@ make_cflags_and_ldflags() {

 	CFLAGS="$CFLAGS -DGLOBAL_DATA_DIR=\\\\\"$prefix_dir/$data_dir\\\\\""

-	log 1 "using CFLAGS... $CFLAGS"
+	log 1 "using CFLAGS... $CFLAGS $CC_CFLAGS"
 	log 1 "using LDFLAGS... $LIBS $LDFLAGS"

 	# Makedepend doesn't like something like: -isysroot /OSX/blabla
@@ -1415,12 +1400,8 @@ make_cflags_and_ldflags() {
 	# Lovely hackish, not?
 	# Btw, this almost always comes from outside the configure, so it is
 	#  not something we can control.
-	# Also make makedepend aware of compiler's built-in defines.
 	if [ "$with_makedepend" != "0" ]; then
-		cflags_makedep="`echo | $cxx_host -E -x c++ -dM - | sed 's@.define @-D@g;s@ .*@ @g;s@(.*)@@g' | tr -d '\r\n'`"
-
-		# Please escape ALL " within ` because e.g. "" terminates the string in some sh implementations
-		cflags_makedep="$cflags_makedep `echo \"$CFLAGS\" | sed 's@ /@ -@g;s@-I[ ]*[^ ]*@@g'`"
+		cflags_makedep="` echo "$CFLAGS" | sed 's~ /~ -~g;s~-I[ ]*[^ ]*~~g'`"
 	else
 		makedepend=""
 	fi
@@ -1599,7 +1580,7 @@ check_strip() {
 	elif [ "$os" = "OSX" ]; then
 		# Most targets have -V in strip, to see if they exists... OSX doesn't.. so execute something
 		echo "int main(int argc, char *argv[]) { }" > strip.test.c
-		$cxx_host strip.test.c -o strip.test
+		$cc_host strip.test.c -o strip.test
 		check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "strip.test"
 		rm -f strip.test.c strip.test
 	else
@@ -1610,7 +1591,7 @@ check_strip() {
 check_lipo() {
 	if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]; then
 		echo "int main(int argc, char *argv[]) { }" > lipo.test.c
-		$cxx_host lipo.test.c -o lipo.test
+		$cc_host lipo.test.c -o lipo.test
 		check_compiler "host lipo" "lipo" "$host" "$lipo" "$LIPO" "lipo" "lipo" "4" "-info lipo.test"
 		rm -f lipo.test.c lipo.test
 	fi
@@ -1636,28 +1617,6 @@ set_universal_binary_flags() {
 	fi
 }

-check_osx_sdk() {
-cat > tmp.osx.mm << EOF
-#include <Cocoa/Cocoa.h>
-int main() {
-	kCGBitmapByteOrder32Host;
-	return 0;
-}
-EOF
-	execute="$cxx_host $CFLAGS tmp.osx.mm -framework Cocoa -o tmp.osx 2>&1"
-	eval $execute > /dev/null
-	ret=$?
-	log 2 "executing $execute"
-	log 2 "  exit code $ret"
-	rm -f tmp.osx.mm tmp.osx
-	if [ "$ret" != "0" ]; then
-		log 1 "Your system SDK is probably too old"
-		log 1 "Please install/upgrade your Xcode to >= 2.5"
-
-		exit 1
-	fi
-}
-
 check_direct_music() {
 	echo "
 		#include <windows.h>
@@ -1809,7 +1768,6 @@ detect_os() {
 					/cygwin/       { print "CYGWIN";  exit}
 					/mingw/        { print "MINGW";   exit}
 					/os\/2/        { print "OS2";     exit}
-					/gnu/          { print "UNIX";    exit}
 			'`
 		fi

@@ -2308,9 +2266,9 @@ detect_icu() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"

-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -lt "22" ]; then
-		if [ -n "$shortversion" ] && [ "$shortversion" -lt "22" ]; then
-			log 1 "checking libicu... needs at least version 2.2.0, icu NOT enabled"
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -lt "20" ]; then
+		if [ -n "$shortversion" ] && [ "$shortversion" -lt "20" ]; then
+			log 1 "checking libicu... needs at least version 2.0.0, icu NOT enabled"
 		else
 			log 1 "checking libicu... not found"
 		fi
@@ -2447,7 +2405,7 @@ int main() {
 }
 EOF
 	execute="$cxx_host $CFLAGS -c tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1"
-	eval $execute > /dev/null
+	eval $execute >&/dev/null
 	ret=$?
 	log 2 "executing $execute"
 	log 2 "  exit code $ret"
@@ -2468,7 +2426,7 @@ int main() {
 }
 EOF
 	execute="$cxx_host $CFLAGS tmp.iconv.cpp -o tmp.iconv -DTESTING 2>&1"
-	eval $execute > /dev/null
+	eval $execute >&/dev/null
 	ret=$?
 	log 2 "executing $execute"
 	log 2 "  exit code $ret"
@@ -2543,8 +2501,7 @@ detect_cputype() {
 		log 1 "forcing cpu-type... $cpu_type bits"
 		return;
 	fi
-	echo "#define _SQ64 1" > tmp.64bit.cpp
-	echo "#include \"src/stdafx.h\"" >> tmp.64bit.cpp
+	echo "#include \"src/stdafx.h\"" > tmp.64bit.cpp
 	echo "assert_compile(sizeof(size_t) == 8);" >> tmp.64bit.cpp
 	echo "int main() { return 0; }" >> tmp.64bit.cpp
 	execute="$cxx_host $CFLAGS tmp.64bit.cpp -o tmp.64bit -DTESTING 2>&1"
@@ -2562,6 +2519,17 @@ make_sed() {
 	T_CFLAGS="$CFLAGS"
 	T_LDFLAGS="$LDFLAGS"

+	# We check here if we are PPC, because then we need to enable FOUR_BYTE_BOOL
+	#  We do this here, and not sooner, so universal builds also have this
+	#  automatically correct
+	# FOUR_BYTE_BOOL is needed, because C++ uses 4byte for a bool on PPC, where
+	#  we use 1 byte per bool normally in C part. So convert that last one to 4
+	#  bytes too, but only for PPC.
+	ppc=`$cc_host -dumpmachine | egrep "powerpc|ppc"`
+	if [ -n "$ppc" ]; then
+		T_CFLAGS="$T_CFLAGS -DFOUR_BYTE_BOOL"
+	fi
+
 	SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR"

 	# All the data needed to compile a single target
@@ -2569,102 +2537,104 @@ make_sed() {
 	#  use multiple OBJS_DIR, because all in-between
 	#  binaries are stored in there, and nowhere else.
 	SRC_REPLACE="
-		s@!!CC_HOST!!@$cc_host@g;
-		s@!!CXX_HOST!!@$cxx_host@g;
-		s@!!CC_BUILD!!@$cc_build@g;
-		s@!!CXX_BUILD!!@$cxx_build@g;
-		s@!!WINDRES!!@$windres@g;
-		s@!!STRIP!!@$strip $strip_arg@g;
-		s@!!LIPO!!@$lipo@g;
-		s@!!CFLAGS!!@$T_CFLAGS@g;
-		s@!!CFLAGS_BUILD!!@$CFLAGS_BUILD@g;
-		s@!!STRGEN_FLAGS!!@$strgen_flags@g;
-		s@!!LIBS!!@$LIBS@g;
-		s@!!LDFLAGS!!@$T_LDFLAGS@g;
-		s@!!BIN_DIR!!@$BIN_DIR@g;
-		s@!!ROOT_DIR!!@$ROOT_DIR@g;
-		s@!!MEDIA_DIR!!@$MEDIA_DIR@g;
-		s@!!SOURCE_LIST!!@$SOURCE_LIST@g;
-		s@!!SRC_OBJS_DIR!!@$SRC_OBJS_DIR@g;
-		s@!!LANG_OBJS_DIR!!@$LANG_OBJS_DIR@g;
-		s@!!SRC_DIR!!@$SRC_DIR@g;
-		s@!!SCRIPT_SRC_DIR!!@$SCRIPT_SRC_DIR@g;
-		s@!!OSXAPP!!@$OSXAPP@g;
-		s@!!LANG_DIR!!@$LANG_DIR@g;
-		s@!!TTD!!@$TTD@g;
-		s@!!BINARY_DIR!!@$prefix_dir/$binary_dir@g;
-		s@!!DATA_DIR!!@$prefix_dir/$data_dir@g;
-		s@!!DOC_DIR!!@$prefix_dir/$doc_dir@g;
-		s@!!MAN_DIR!!@$prefix_dir/$man_dir@g;
-		s@!!ICON_DIR!!@$prefix_dir/$icon_dir@g;
-		s@!!ICON_THEME_DIR!!@$prefix_dir/$icon_theme_dir@g;
-		s@!!PERSONAL_DIR!!@$personal_dir@g;
-		s@!!SHARED_DIR!!@$shared_dir@g;
-		s@!!INSTALL_DIR!!@$install_dir@g;
-		s@!!BINARY_NAME!!@$binary_name@g;
-		s@!!STRGEN!!@$STRGEN@g;
-		s@!!ENDIAN_CHECK!!@$ENDIAN_CHECK@g;
-		s@!!ENDIAN_FORCE!!@$endian@g;
-		s@!!STAGE!!@$STAGE@g;
-		s@!!MAKEDEPEND!!@$makedepend@g;
-		s@!!CFLAGS_MAKEDEP!!@$cflags_makedep@g;
-		s@!!SORT!!@$sort@g;
-		s@!!CONFIG_CACHE_COMPILER!!@config.cache.compiler@g;
-		s@!!CONFIG_CACHE_LINKER!!@config.cache.linker@g;
-		s@!!CONFIG_CACHE_ENDIAN!!@config.cache.endian@g;
-		s@!!CONFIG_CACHE_SOURCE!!@config.cache.source@g;
-		s@!!CONFIG_CACHE_VERSION!!@config.cache.version@g;
-		s@!!CONFIG_CACHE_SOURCE_LIST!!@config.cache.source.list@g;
-		s@!!CONFIG_CACHE_PWD!!@config.cache.pwd@g;
-		s@!!LANG_SUPPRESS!!@$lang_suppress@g;
-		s@!!OBJS_C!!@$OBJS_C@g;
-		s@!!OBJS_CPP!!@$OBJS_CPP@g;
-		s@!!OBJS_MM!!@$OBJS_MM@g;
-		s@!!OBJS_RC!!@$OBJS_RC@g;
-		s@!!SRCS!!@$SRCS@g;
-		s@!!OS!!@$os@g;
-		s@!!CONFIGURE_FILES!!@$CONFIGURE_FILES@g;
-		s@!!REVISION!!@$revision@g;
-		s@!!AWK!!@$awk@g;
-		s@!!DISTCC!!@$distcc@g;
+		s~!!CC_HOST!!~$cc_host~g;
+		s~!!CXX_HOST!!~$cxx_host~g;
+		s~!!CC_BUILD!!~$cc_build~g;
+		s~!!CXX_BUILD!!~$cxx_build~g;
+		s~!!WINDRES!!~$windres~g;
+		s~!!STRIP!!~$strip $strip_arg~g;
+		s~!!LIPO!!~$lipo~g;
+		s~!!CC_CFLAGS!!~$CC_CFLAGS~g;
+		s~!!CFLAGS!!~$T_CFLAGS~g;
+		s~!!CFLAGS_BUILD!!~$CFLAGS_BUILD~g;
+		s~!!STRGEN_FLAGS!!~$strgen_flags~g;
+		s~!!LIBS!!~$LIBS~g;
+		s~!!LDFLAGS!!~$T_LDFLAGS~g;
+		s~!!BIN_DIR!!~$BIN_DIR~g;
+		s~!!ROOT_DIR!!~$ROOT_DIR~g;
+		s~!!MEDIA_DIR!!~$MEDIA_DIR~g;
+		s~!!SOURCE_LIST!!~$SOURCE_LIST~g;
+		s~!!SRC_OBJS_DIR!!~$SRC_OBJS_DIR~g;
+		s~!!LANG_OBJS_DIR!!~$LANG_OBJS_DIR~g;
+		s~!!SRC_DIR!!~$SRC_DIR~g;
+		s~!!SCRIPT_SRC_DIR!!~$SCRIPT_SRC_DIR~g;
+		s~!!OSXAPP!!~$OSXAPP~g;
+		s~!!LANG_DIR!!~$LANG_DIR~g;
+		s~!!TTD!!~$TTD~g;
+		s~!!BINARY_DIR!!~$prefix_dir/$binary_dir~g;
+		s~!!DATA_DIR!!~$prefix_dir/$data_dir~g;
+		s~!!DOC_DIR!!~$prefix_dir/$doc_dir~g;
+		s~!!MAN_DIR!!~$prefix_dir/$man_dir~g;
+		s~!!ICON_DIR!!~$prefix_dir/$icon_dir~g;
+		s~!!ICON_THEME_DIR!!~$prefix_dir/$icon_theme_dir~g;
+		s~!!PERSONAL_DIR!!~$personal_dir~g;
+		s~!!SHARED_DIR!!~$shared_dir~g;
+		s~!!INSTALL_DIR!!~$install_dir~g;
+		s~!!BINARY_NAME!!~$binary_name~g;
+		s~!!STRGEN!!~$STRGEN~g;
+		s~!!ENDIAN_CHECK!!~$ENDIAN_CHECK~g;
+		s~!!ENDIAN_FORCE!!~$endian~g;
+		s~!!STAGE!!~$STAGE~g;
+		s~!!MAKEDEPEND!!~$makedepend~g;
+		s~!!CFLAGS_MAKEDEP!!~$cflags_makedep~g;
+		s~!!SORT!!~$sort~g;
+		s~!!CONFIG_CACHE_COMPILER!!~config.cache.compiler~g;
+		s~!!CONFIG_CACHE_LINKER!!~config.cache.linker~g;
+		s~!!CONFIG_CACHE_ENDIAN!!~config.cache.endian~g;
+		s~!!CONFIG_CACHE_SOURCE!!~config.cache.source~g;
+		s~!!CONFIG_CACHE_VERSION!!~config.cache.version~g;
+		s~!!CONFIG_CACHE_SOURCE_LIST!!~config.cache.source.list~g;
+		s~!!CONFIG_CACHE_PWD!!~config.cache.pwd~g;
+		s~!!LANG_SUPPRESS!!~$lang_suppress~g;
+		s~!!OBJS_C!!~$OBJS_C~g;
+		s~!!OBJS_CPP!!~$OBJS_CPP~g;
+		s~!!OBJS_MM!!~$OBJS_MM~g;
+		s~!!OBJS_RC!!~$OBJS_RC~g;
+		s~!!SRCS!!~$SRCS~g;
+		s~!!OS!!~$os~g;
+		s~!!CONFIGURE_FILES!!~$CONFIGURE_FILES~g;
+		s~!!REVISION!!~$revision~g;
+		s~!!AWK!!~$awk~g;
+		s~!!GCC295!!~$gcc295~g;
+		s~!!DISTCC!!~$distcc~g;
 	"

 	if [ "$icon_theme_dir" != "" ]; then
 		SRC_REPLACE="$SRC_REPLACE
-			s@!!ICON_THEME_DIR!!@$prefix_dir/$icon_theme_dir@g;
+			s#!!ICON_THEME_DIR!!#$prefix_dir/$icon_theme_dir#g;
 		"
 	else
 		SRC_REPLACE="$SRC_REPLACE
-			s@!!ICON_THEME_DIR!!@@g;
+			s#!!ICON_THEME_DIR!!##g;
 		"
 	fi

 	if [ "$man_dir" != "" ]; then
 		SRC_REPLACE="$SRC_REPLACE
-			s@!!MAN_DIR!!@$prefix_dir/$man_dir@g;
+			s#!!MAN_DIR!!#$prefix_dir/$man_dir#g;
 		"
 	else
 		SRC_REPLACE="$SRC_REPLACE
-			s@!!MAN_DIR!!@@g;
+			s#!!MAN_DIR!!##g;
 		"
 	fi

 	if [ "$menu_dir" != "" ]; then
 		SRC_REPLACE="$SRC_REPLACE
-			s@!!MENU_DIR!!@$prefix_dir/$menu_dir@g;
+			s#!!MENU_DIR!!#$prefix_dir/$menu_dir#g;
 		"
 	else
 		SRC_REPLACE="$SRC_REPLACE
-			s@!!MENU_DIR!!@@g;
+			s#!!MENU_DIR!!##g;
 		"
 	fi
 }

 generate_menu_item() {
 	MENU_REPLACE="
-		s@!!TTD!!@$TTD@g;
-		s@!!MENU_GROUP!!@$menu_group@g;
-		s@!!MENU_NAME!!@$menu_name@g
+		s~!!TTD!!~$TTD~g;
+		s~!!MENU_GROUP!!~$menu_group~g;
+		s~!!MENU_NAME!!~$menu_name~g
 	"
 	log 1 "Generating menu item..."
 	mkdir -p media
@@ -2855,8 +2825,6 @@ showhelp() {
 	echo "  --with-fontconfig[=pkg-config fontconfig]"
 	echo "                                 enables fontconfig support"
 	echo "  --with-icu[=icu-config]        enables icu (used for right-to-left support)"
-	echo "  --static-icu                   try to link statically (libsicu instead of"
-	echo "                                 libicu; can fail as the new name is guessed)"
 	echo "  --with-iconv[=iconv-path]      enables iconv support"
 	echo "  --with-psp-config[=psp-config] enables psp-config support (PSP ONLY)"
 	echo "  --with-makedepend[=makedepend] enables makedepend support"
@@ -1,13 +1,5 @@
 #!/bin/sh

-check_path_characters() {
-	if [ -n "`echo $ROOT_DIR | grep '[^-_A-Za-z0-9\/\\\.:]'`" ]; then
-		echo "WARNING: The path contains a non-alphanumeric character that might cause"
-		echo "         failures in subsequent build stages. Any failures with the build"
-		echo "         will most likely be caused by this."
-	fi
-}
-
 CONFIGURE_EXECUTABLE="$_"
 # On *nix systems those two are equal when ./configure is done
 if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; then
@@ -22,16 +14,9 @@ if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; then
 fi
 # Find out where configure is (in what dir)
 ROOT_DIR="`dirname $0`"
-# For MSYS/MinGW we want to know the FULL path. This as that path is generated
-# once you call an outside binary. Having the same path for the rest is needed
-# for dependency checking.
-# pwd -W returns said FULL path, but doesn't exist on others so fall back.
-ROOT_DIR="`cd $ROOT_DIR && (pwd -W 2>/dev/null || pwd 2>/dev/null)`"
+ROOT_DIR="`cd $ROOT_DIR && pwd`"

-check_path_characters
-
-# Same here as for the ROOT_DIR above
-PWD="`pwd -W 2>/dev/null || pwd 2>/dev/null`"
+PWD="`pwd`"
 PREFIX="$PWD/bin"

 . $ROOT_DIR/config.lib
@@ -52,11 +37,10 @@ if [ "$1" = "--reconfig" ] || [ "$1" = "--reconfigure" ]; then
 		exit 1
 	fi
 	# Make sure we don't lock config.cache
-	cat config.cache | sed 's@\\ @\\\\ @g' > cache.tmp
+	cat config.cache | sed 's~\\ ~\\\\ ~g' > cache.tmp
 	sh cache.tmp
-	RET=$?
 	rm -f cache.tmp
-	exit $RET
+	exit $?
 fi

 set_default
@@ -75,7 +59,7 @@ STRGEN="strgen$EXE"
 ENDIAN_CHECK="endian_check$EXE"

 if [ -z "$sort" ]; then
-	PIPE_SORT="sed s@a@a@"
+	PIPE_SORT="sed s~a~a~"
 else
 	PIPE_SORT="$sort"
 fi
@@ -86,7 +70,7 @@ if [ ! -f "$LANG_DIR/english.txt" ]; then
 fi

 # Read the source.list and process it
-AWKCOMMAND='
+SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk '
 	{  }
 	/^(	*)#end/  { if (deep == skip) { skip -= 1; } deep -= 1; next; }
 	/^(	*)#else/ { if (deep == skip) { skip -= 1; } else if (deep - 1 == skip) { skip += 1; } next; }
@@ -131,21 +115,17 @@ AWKCOMMAND='
 			print $0;
 		}
 	}
-'
+' | $PIPE_SORT`"

-# Read the source.list and process it
-# Please escape ALL " within ` because e.g. "" terminates the string in some sh implementations
-SRCS="`< $ROOT_DIR/source.list tr '\r' '\n' | $awk \"$AWKCOMMAND\" | $PIPE_SORT`"
-
-OBJS_C="`  echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.c$/   { gsub(\".c$\",   \".o\", $0); print $0; }'`"
-OBJS_CPP="`echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.cpp$/ { gsub(\".cpp$\", \".o\", $0); print $0; }'`"
-OBJS_MM="` echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.mm$/  { gsub(\".mm$\",  \".o\", $0); print $0; }'`"
-OBJS_RC="` echo \"$SRCS\" | $awk ' { ORS = \" \" } /\.rc$/  { gsub(\".rc$\",  \".o\", $0); print $0; }'`"
-SRCS="`    echo \"$SRCS\" | $awk ' { ORS = \" \" } { print $0; }'`"
+OBJS_C="`  echo \"$SRCS\" | $awk ' { ORS = " " } /\.c$/   { gsub(".c$",   ".o", $0); print $0; }'`"
+OBJS_CPP="`echo \"$SRCS\" | $awk ' { ORS = " " } /\.cpp$/ { gsub(".cpp$", ".o", $0); print $0; }'`"
+OBJS_MM="` echo \"$SRCS\" | $awk ' { ORS = " " } /\.mm$/  { gsub(".mm$",  ".o", $0); print $0; }'`"
+OBJS_RC="` echo \"$SRCS\" | $awk ' { ORS = " " } /\.rc$/  { gsub(".rc$",  ".o", $0); print $0; }'`"
+SRCS="`    echo \"$SRCS\" | $awk ' { ORS = " " } { print $0; }'`"

 # In makefiles, we always use -u for sort
 if [ -z "$sort" ]; then
-	sort="sed s@a@a@"
+	sort="sed s~a~a~"
 else
 	sort="$sort -u"
 fi
@@ -155,5 +135,3 @@ CONFIGURE_FILES="$ROOT_DIR/configure $ROOT_DIR/config.lib $ROOT_DIR/Makefile.in
 generate_main
 generate_lang
 generate_src
-
-check_path_characters
@@ -1,7 +1,7 @@
 STRGEN USAGE
 ------------
 This guide is only interesting for people who want to alter something
-themselves without access to translator.openttd.org. Please note that
+themselves without access to WT2 (translator2.openttd.org). Please note that
 your compiled language file will only be compatible with the OpenTTD version
 you have downloaded english.txt, the master language file, for. While this is
 not always true, namely when changes in the code have not touched language
@@ -514,8 +514,8 @@
   <td>
    <ul>
     <li>m2: Index into the array of towns (owning town for town roads; closest town otherwise, INVALID_TOWN if there is no town or we are creating a town)</li>
-     <li>m7 bit 5 set = on snow or desert</li>
-     <li>m7 bits 7..6: present road types
+     <li>m3 bit 7 set = on snow or desert</li>
+     <li>m7 bits 7..5: present road types
      <table>
       <tr>
        <td>bit 0&nbsp; </td>
@@ -526,11 +526,16 @@
        <td>bit 1&nbsp; </td>
        <td>tram</td>
       </tr>
+
+       <tr>
+        <td>bit 2&nbsp; </td>
+        <td>reserved</td>
+       </tr>
      </table>
     </li>
     <li>m5 bits 7 clear: road or level-crossing
      <ul>
-       <li>m6 bits 5..3:
+       <li>m3 bits 6..4:
        <table>
         <tr>
          <td><tt>0</tt>&nbsp; </td>
@@ -562,12 +567,13 @@
         </tr>
        </table>
       </li>
-       <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
+       <li>m5 bits 3..0: <a href="#OwnershipInfo">owner</a> of road type 1 (tram); OWNER_NONE (<tt>10</tt>) is stored as OWNER_TOWN (<tt>0F</tt>)
+       <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road type 2 (reserved)
       <li>m5 bit 6 clear: road
        <ul>
         <li>m1: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
-         <li>m7 bits 3..0: counter for the roadworks</li>
-         <li>m5 bits 3..0: road layout road type 0 (normal road): bit set = road piece present:
+         <li>m3 bits 3..0: counter for the roadworks</li>
+         <li>m4 bits 3..0: road layout road type 0 (normal road): bit set = road piece present:
          <table>
           <tr>
            <td align=left>bit 0: </td>
@@ -587,7 +593,8 @@
           </tr>
          </table>
         </li>
-         <li>m3 bits 0..3: road layout road type 1 (tram)</li>
+         <li>m4 bits 7..4: road layout road type 1 (tram)</li>
+         <li>m6 bits 5..2: road layout road type 2 (reserved)</li>
         <li>m5 bits 5..4: bits to disallow vehicles to go a specific direction
          <table>
           <tr>
@@ -606,7 +613,7 @@
        <ul>
         <li>m1: <a href="#OwnershipInfo">owner</a> of the railway track</li>
         <li>m3 bits 3..0: <a href="#TrackType">railway track type</a></li>
-         <li>m5 bit 0: direction
+         <li>m4 bit 6: direction
          <table>
           <tr>
            <td align=left><tt>0</tt>&nbsp; </td>
@@ -618,8 +625,8 @@
           </tr>
          </table>
         </li>
-         <li>m5 bit 5: set if crossing lights are on</li>
-         <li>m6 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
+          <li>m4 bit 5: set if crossing lights are on</li>
+         <li>m4 bits 4..0: <a href="#OwnershipInfo">owner</a> of the road type 0 (normal road)</li>
         <li>m5 bit 4: pbs reservation state</li>
        </ul>
       </li>
@@ -835,9 +842,9 @@
    <ul>
     <li>m1: <a href="#OwnershipInfo">owner</a> of the station</li>
     <li>m2: index into the array of stations</li>
-     <li>m3 bits 7..4: persistent random data for newstations (train station)</li>
-     <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram tracks (road stop)</li>
+     <li>m3 bits 7..4: persistent random data for newstations</li>
     <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway stations</li>
+     <li>m3 bits 2..0: present road types for road stops</li>
     <li>m3 bits 1..0: water class for buoys and water part of docks</li>
     <li>m4: custom station id; 0 means standard graphics</li>
     <li>m5: graphics index (range from 0..255 for each station type):
@@ -936,12 +943,10 @@
      </table>
     </li>
     <li>m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy)</li>
+     <li>m6 bit 2: 1 when a drive through road stop is built over a town owned road, otherwise 0</li>
     <li>m6 bit 2: pbs reservation state for railway stations</li>
-
     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
-     <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road (road stops)</li>
-     <li>m7 bits 7..6: present road types (road stops)</li>
-     <li>m7: animation frame (train station)</li>
+     <li>m7: animation frame</li>
    </ul>
   </td>
  </tr>
@@ -1408,13 +1413,15 @@
   <td>
    <ul>
     <li>m1: <a href="#OwnershipInfo">owner</a></li>
-     <li>m3 bits 7..4: <a href="#OwnershipInfo">owner</a> of tram</li>
+     <li>m2 bits 7..4: see bridge ramp</li>
     <li>m3 bits 3..0: <a href="#TrackType">track type</a> for railway</li>
+     <li>m3 bits 2..0: present road types for road</li>
+     <li>m4 bit 7 set = on snow or desert</li>
     <li>m5 bit 4: pbs reservation state for railway</li>
     <li>m5 bits 7 clear: tunnel entrance/exit</li>
     <li>m5 bit 7 set: bridge ramp
      <ul>
-       <li>m6 bits 5..2: <a name="BridgeType">bridge type</a>:
+       <li>m2 bits 7..4: <a name="BridgeType">bridge type</a>:
        <table>
         <tr>
          <th align=left>Type&nbsp;</th>
@@ -1545,9 +1552,6 @@
     </li>
     <li>m6 bits 7..6 : Possibility of a bridge above, in the <a href="#bridge_direction">direction specified</a></li>
     <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
-     <li>m7 bits 4..0: <a href="#OwnershipInfo">owner</a> of road</li>
-     <li>m7 bit 5 set = on snow or desert</li>
-     <li>m7 bits 7..6: present road types for road</li>
    </ul>
   </td>
  </tr>
@@ -137,10 +137,10 @@ the array so you can quickly see what is used and what is not.
      <td class="bits"><span class="option">~~~</span>X XXXX</td>
      <td class="bits">XXXX XXXX XXXX XXXX</td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XXXX XXXX</td>
-      <td class="bits">XXXX X<span class="free">O</span>XX</td>
-      <td class="bits">XXX<span class="free">O</span> XXXX</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
+      <td class="bits">XXXX XXXX</td>
    </tr>
    <tr>
      <td class="caption">level crossing</td>
@@ -148,17 +148,17 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">XXXX <span class="option">~~</span>XX</td>
+      <td class="bits"><span class="free">O</span>XXX XXXX</td>
+      <td class="bits">XX<span class="free">O</span>X XXXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX<span class="free"> OOO</span>X</td>
-      <td class="bits">XXXX X<span class="free">O</span>XX</td>
-      <td class="bits">XXXX XXXX</td>
    </tr>
    <tr>
      <td class="caption">road depot</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">X<span class="free">OOO OOOO</span></td>
      <td class="bits"><span class="free">OOOO OOOO</span></td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
@@ -205,11 +205,11 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XXXX</td>
+      <td class="bits"><span class="free">OOOO O</span>XXX</td>
      <td class="bits"><span class="option">~~~~ ~~~~</span></td>
      <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
      <td class="bits"><span class="free">OO</span>XX XXXX</td>
-      <td class="bits">XXXX X<span class="free">O</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
      <td class="caption">dock</td>
@@ -308,22 +308,22 @@ the array so you can quickly see what is used and what is not.
      <td class="bits">XXXX XXXX</td>
      <td class="bits"><span class="option">~~~</span>X XXXX</td>
      <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
-      <td class="bits">XXXX <span class="option">~~</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
-      <td class="bits">X<span class="free">OO</span>X XXXX</td>
+      <td class="bits"><span class="free">OOOO</span> <span class="option">~</span><span class="abuse">XXX</span></td>
+      <td class="bits">X<span class="free">OOO OOOO</span></td>
+      <td class="bits">X<span class="free">OO</span>X <span class="option">~</span>XXX</td>
      <td class="bits">XX<span class="free">OO OO</span>XX</td>
-      <td class="bits">XXXX X<span class="free">O</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
      <td>bridge ramp</td>
      <td class="bits">-inherit-</td>
      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">-inherit-</td>
-      <td class="bits">XXXX XXXX</td>
-      <td class="bits">-inherit-</td>
+      <td class="bits"><span class="free">OOOO OOOO</span> XXXX <span class="free">OOOO</span></td>
+      <td class="bits"><span class="free">OOOO</span> <span class="option">~</span><span class="abuse">XXX</span></td>
+      <td class="bits">X<span class="free">OOO OOOO</span></td>
+      <td class="bits">X<span class="free">OO</span>X XXXX</td>
+      <td class="bits">XX<span class="free">OO OO</span>XX</td>
+      <td class="bits"><span class="free">OOOO OOOO</span></td>
    </tr>
    <tr>
      <td rowspan=2>A</td>
@@ -26,7 +26,7 @@
 [metadata]
 ; the name of the pack, preferably less than 16 characters
 name         = example
-; the short name (4 characters), used to identify this set
+; the short name (4 characters), used to identify this set within NewGRFs
 shortname    = XMPL
 ; the version of this graphics set (read as single integer)
 version      = 0
@@ -49,8 +49,6 @@ tropical     = TRGH.GRF
 ; GRF file with extra toyland sprites
 toyland      = TRGT.GRF
 ; NewGRF file using Actions 5, 7, 9 and A to replace sprites
-; Must use a GRF ID starting with FF so it cannot be selected from
-; the in-game NewGRF list and (thus) be loaded twice.
 extra        = OPENTTDD.GRF

 ; The md5s section lists the MD5 checksum for the files that replace them.
@@ -41,10 +41,7 @@ or 1 if omitted
 .It Fl d Ar cat=level[, ...]
 Set debug verbosity for a specific category
 .It Fl D Ar [host][:port]
-Start a dedicated server. Sets network debug level to 6. If you want to change this, use
-.Fl d
-after
-.Fl D
+Start a dedicated server
 .It Fl G Ar seed
 Seed the pseudo random number generator
 .It Fl e
@@ -86,17 +86,17 @@ elif [ -d "$ROOT_DIR/.git" ]; then
 	fi
 	HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`
 	REV="g`echo $HASH | cut -c1-8`"
-	BRANCH=`git branch|grep '[*]' | sed 's@\* @@;s@^master$@@'`
-	REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
+	BRANCH=`git branch|grep '[*]' | sed 's~\* ~~;s~^master$~~'`
+	REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s~.*(svn r\([0-9]*\)).*~\1~"`
 elif [ -d "$ROOT_DIR/.hg" ]; then
 	# We are a hg checkout
 	if [ -n "`hg status \"$SRC_DIR\" | grep -v '^?'`" ]; then
 		MODIFIED="2"
 	fi
-	HASH=`LC_ALL=C hg parents --template="{node}"`
+	HASH=`LC_ALL=C hg parents 2>/dev/null | head -n 1 | cut -d: -f3`
 	REV="h`echo $HASH | cut -c1-8`"
-	BRANCH=`hg branch | sed 's@^default$@@'`
-	REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
+	BRANCH=`hg branch | sed 's~^default$~~'`
+	REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s~.*(svn r\([0-9]*\)).*~\1~"`
 else
 	# We don't know
 	MODIFIED="1"
@@ -1,18 +1,5 @@
-OpenTTD's known bugs
-Last updated:    2009-12-23
-Release version: 0.7.5
+README
 ------------------------------------------------------------------------
-
-
-Table of Contents:
------------------
-1) About
-2) Known bugs in the this stable release
-3) Known bugs that will not be solved
-
-
-1) About:
-- ------
 All bugs listed below are marked as known. Please do not submit any bugs
 that are the same as these. If you do, do not act surprised, because
 we WILL flame you!!
@@ -21,137 +8,22 @@ Of course if you have more knowledge about any of these bugs, have more
 specifics, we welcome you to report them. React to the given bug indicated
 by the number below on http://bugs.openttd.org.

+If the bug report is closed, it has been fixed, which then can be verified
+in the latest SVN version of /trunk.

-2) Known bugs in the this stable release:
-- --------------------------------------
-The following bugs are known to exist in this stable release and
-we intend to fix them. Some bugs are known but are not fixable or
-fixing them would cause further problems. Those bugs can be found
-in the "Known bugs that will not be solved" section.
+Bugs for 0.7.0-beta1
+------------------------------------------------------------------------
+URL: http://bugs.openttd.org

-The bugs in this section all refer to a ticket in our bug tracking system
-that you can find at: http://bugs.openttd.org
-If the bugs are closed but still listed here it means that the bug is fixed
-and that the nightlies and next major release will not have that bug.
-
- 3198	[OSX] "Could not get system colour space" error on some Mac OS X 10.6
- 3194	[OSX] Full screen 'strobing' on some Mac OS X 10.6
- 3190	[OSX] Compiling fails on some Mac OS X 10.6
- 3159	[NewGRF] Autoreplace resets (or does not keep) value of variable F2
- 3057	Road vehicle sometimes 'forget' the need for servicing
- 3040	Not all alternatives are always shown in the "Join station" list
- 2955	With path signals depots are less likely to be visited
- 2891	Ignore signal does not keep the train running when in path signalled block till the next signal
- 2769	No offer for buying bankrupt AIs
- 2616	[NewGRF] Cloning creates vehicles with invalid subcargos
- 2613	[NewGRF] House property 15 does not work
+- 2631	Trains not chosing closest platform on large station
+- 2616	Cloning creates vehicles with invalid subcargos
 - 2585	[OSX] OS' mouse pointer showing
- 2484	[OSX] Cannot enter CJK characters
 - 2427	Vehicle owner gets paid for whole cargo feeder share
 - 1944	Road vehicles not picking empty drivethrough platform
 - 1762	Strange Autoreplace behaviour
 - 1495	Long vehicles might block multistop drivethrough stations
+- 1404	Spinner widget interprets one click as many
+- 1473	Lost trains ignore exit signals
 - 1140	[OSX] Not smooth moving map with touchpad
 - 1072	Text overflows in several windows
-
-
-3) Known bugs that will not be solved:
-- -----------------------------------
-This section lists all known bugs that we do not intend to fix and the
-reasons why we think that fixing them is infeasible. We might make some
-minor improvements that reduce the scope of these bugs, but we will not
-be able to completely fix them.
-
-No suitable AI can be found
-	If you have no AIs and an AI is started the so-called 'dummy' AI will
-	be loaded. This AI does nothing but writing a message on the AI debug
-	window and showing a red warning. There are basically two solutions
-	for this problem: you must change the settings so no AI is started,
-	this is done in the difficulty settings window. The other solution is
-	acquiring (downloading) some AI. The easiest way to do this is via
-	the "Check Online Content" button in the main (intro) menu or via
-	"AI Settings" -> "Select AI" -> "Check Online Content" which is also
-	accessed via the main menu.
-
-Clipping problems [FS#119]
-	In some cases sprites are not drawn as one would expect. Examples of
-	this are aircraft that might be hidden below the runway or trees that
-	in some cases are rendered over vehicles.
-	The primary cause of this problem is that OpenTTD does not have enough
-	data (like a 3D model) to properly determine what needs to be drawn in
-	front of what. OpenTTD has bounding boxes but in lots of cases they
-	are either too big or too small and then cause problems with what
-	needs to be drawn in front of what. Also some visual tricks are used.
-	For example trains at 8 pixels high, the catenary needs to be drawn
-	above that. When you want to draw bridges on top of that, which are
-	only one height level (= 8 pixels) higher, you are getting into some
-	big problems.
-	We can not change the height levels; it would require us to either
-	redraw all vehicle or all landscape graphics. Doing so would mean we
-	leave the Transport Tycoon graphics, which in effect means OpenTTD
-	will not be a Transport Tycoon clone anymore.
-
-Lost trains ignore (block) exit signals [FS#1473]
-	If trains are lost they ignore block exit signals, blocking junctions
-	with presignals. This is caused because the path finders cannot tell
-	where the train needs to go. As such a random direction is chosen at
-	each junction. This causes the trains to occasionally to make choices
-	that are unwanted from a player's point of view.
-	This will not be fixed because lost trains are in almost all cases a
-	network problem, e.g. a train can never reach a specific place. This
-	makes the impact of fixing the bug enormously small against the
-	amount of work needed to write a system that prevents the lost trains
-	from taking the wrong direction.
-
-Forbid 90 degree turns does not work for crossing PBS paths [FS#2737]
-	When you run a train through itself on a X junction with PBS turned on
-	the train will not obey the 'forbid 90 degree turns' setting. This is
-	due to the fact that we can not be sure that the setting was turned
-	off when the track was reserved, which means that we assume it was
-	turned on and that the setting does not hold at the time. We made it
-	this way to allow one to change the setting in-game, but it breaks
-	slightly when you are running your train through itself. Running a
-	train through means that your network is broken and is thus a user
-	error which OpenTTD tries to graciously handle.
-	Fixing this bug means that we need to record whether this particular
-	setting was turned on or off at the time the reservation was made. This
-	means adding quite a bit of data to the savegame for solving an issue
-	that is basically an user error. We think it is not worth the effort.
-
-Duplicate (station) names after renaming [FS#3204]
-	After renaming stations one can create duplicate station names. This
-	is done giving a station the same custom name as another station with
-	an automatically generated name.
-	The major part of this problem is that station names are translatable.
-	Meaning that a station is called e.g. '<TOWN> Central' in English and
-	'<TOWN> Centraal' in Dutch. This means that in network games the
-	renaming of a town could cause the rename to succeed on some clients
-	and fail at others. This creates an inconsistent game state that will
-	be seen as a 'desync'. Secondly the custom names are intended to fall
-	completely outside of the '<TOWN> <name>' naming of stations, so when
-	you rename a town all station names are updated accordingly.
-	As a result the decision has been made that all custom names are only
-	compared to the other custom names in the same class and not compared
-	to the automatically generated names.
-
-Extreme CPU usage/hangs when using SDL and PulseAudio [FS#3294]
-	OpenTTD can be extremely slow/use a lot of CPU when the sound is
-	played via SDL and then through PulseAudio's ALSA wrapper. Under the
-	same configuration OpenTTD, or rather SDL, might hang when exiting
-	the game. This setup seems to be the default configuration for
-	Ubuntu 9.04 and later. For Ubuntu this issue can be solved by
-	installing the 'libsdl1.2debian-pulseaudio' package from Ubuntu's
-	Universe repository. For other distributions a similar package needs
-	to be installed.
-
-OpenTTD not properly resizing with SDL on X [FS#3305]
-	Under some X window managers OpenTTD's window does not properly
-	resize. You will either end up with a black bar at the right/bottom
-	side of the window or you cannot see the right/bottom of the window,
-	e.g you cannot see the status bar. The problem is that OpenTTD does
-	not always receive a resize event from SDL making it impossible for
-	OpenTTD to know that the window was resized; sometimes moving the
-	window will solve the problem.
-	Window managers that are known to exhibit this behaviour are KDE's
-	and GNOME's. With the XFCE's and LXDE's window managers the resize
-	event is sent when the user releases the mouse.
+-  119	Clipping problems with vehicles on slopes
@@ -1,6 +1,7 @@
 # $Id$
 # http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.1.html
 [Desktop Entry]
+Encoding=UTF-8
 Type=Application
 Version=1.1
 Name=!!MENU_NAME!!
@@ -1,112 +1,4 @@
-openttd (0.7.5) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 23 Dec 2009 20:52:34 +0100
-
-openttd (0.7.5~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 14 Dec 2009 19:28:37 +0100
-
-openttd (0.7.4) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 01 Dec 2009 01:23:45 +0100
-
-openttd (0.7.4~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 15 Nov 2009 16:30:07 +0100
-
-openttd (0.7.3) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 01 Oct 2009 12:35:47 +0200
-
-openttd (0.7.3~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Sep 2009 21:30:43 +0200
-
-openttd (0.7.3~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 13 Sep 2009 10:25:56 +0200
-
-openttd (0.7.2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 01 Aug 2009 00:19:43 +0200
-
-openttd (0.7.2~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 21 Jul 2009 20:25:56 +0200
-
-openttd (0.7.2~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 15 Jul 2009 22:25:56 +0200
-
-openttd (0.7.1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 09 Jun 2009 01:34:56 +0200
-
-openttd (0.7.1~RC3) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 03 Jun 2009 15:34:56 +0200
-
-openttd (0.7.1~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 21 Mar 2009 14:34:56 +0200
-
-openttd (0.7.1~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 11 Mar 2009 17:34:56 +0200
-
-openttd (0.7.0) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 01 Apr 2009 13:37:42 +0000
-
-openttd (0.7.0~RC2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 23 Mar 2009 00:42:00 +0200
-
-openttd (0.7.0~RC1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 16 Mar 2009 00:07:00 +0200
-
-openttd (0.7.0~beta2) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 10 Mar 2009 00:33:05 +0100
-
-openttd (0.7.0~beta1) unstable; urgency=low
+openttd (0.7.0-beta1) unstable; urgency=low

  * New upstream release.

@@ -7,13 +7,10 @@
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself
 #
-# Note: for (at least) CentOS '#' comments end '\' continue command on new line.
-#       So place all '#' commented parameters of e.g. configure to the end.
-#
 #-------------------------------------------------------------------------------

 Name:          openttd
-Version:       0.7.5
+Version:       0.7.0
 Release:       1%{?dist}

 Group:         Amusements/Games
@@ -21,12 +18,13 @@ License:       GPLv2
 URL:           http://www.openttd.org
 Summary:       OpenTTD is an Open Source clone of Chris Sawyer's Transport Tycoon Deluxe

-Source:        %{name}-%{version}-source.tar.bz2
+Source:        %{name}-%{version}.tar.bz2

 Requires:      fontconfig
+Requires:      libicu
+Requires:      libpng
 Requires:      SDL
 Requires:      zlib
-BuildRequires: gcc-c++
 BuildRequires: fontconfig-devel
 BuildRequires: libpng-devel
 BuildRequires: libicu-devel
@@ -37,32 +35,33 @@ BuildRequires: zlib-devel
 Requires:      freetype
 BuildRequires: freetype-devel
 %endif
+%if %{_vendor}=="MandrakeSoft" || %{_vendor}=="mandriva"
+Requires:      freetype2
+BuildRequires: libfreetype6-devel
+%endif
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
 Requires:      freetype
 BuildRequires: freetype-devel
 BuildRequires: desktop-file-utils
 %endif
-%if %{_vendor}=="suse" || %{_vendor}=="mandriva"
+%if %{_vendor}=="suse"
 Requires:      freetype2
 BuildRequires: freetype2-devel
 %endif
-%if %{_vendor}=="suse"
-BuildRequires: update-desktop-files
-%endif
-
-# recommends works for suse (not sles9) and mandriva, only
-%if 0%{?suse_version} > 910  || %{_vendor}=="mandriva"
-Recommends:	opengfx
-# for 0.8.0
-#Recommends:	opensfx
-%endif

 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot

 %description
 OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
-with lots of new features and enhancements. To play the game you need either
-the original data from the game or install the recommend package OpenGFX.
+with lots of new features and enhancements. To play the game you need to copy
+the following 6 data files from your Transport Tycoon Deluxe CD to the game
+data directory in %{_datadir}/games/%{name}/data:
+
+From the Windows version of TTD you need:
+sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf
+
+Or if you have the DOS version you need:
+sample.cat TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF

 OpenTTD is licensed under the GNU General Public License version 2.0. For more
 information, see the file 'COPYING' included with every release and source
@@ -72,71 +71,49 @@ download of the game.
 %setup -q

 %build
-# suse sle <10 has no support for makedepend
-%if 0%{?sles_version} == 9 || 0%{?sles_version} == 10
-%define 	do_makedepend	0
-%else
-%define 	do_makedepend	1
-%endif
 ./configure \
+	--revision=%{version} \
 	--prefix-dir="%{_prefix}" \
-	--binary-name="%{name}" \
-	--enable-strip \
 	--binary-dir="bin" \
-	--data-dir="share/%{name}" \
-	--with-makedepend="%{do_makedepend}" \
-#	--revision="%{ver}%{?prever:-%{prever}}" \
-#	--enable-debug=0 \
-#	--with-sdl \
-#	--with-zlib \
-#	--with-png \
-#	--with-freetype \
-#	--with-fontconfig \
-#	--with-icu \
-#	--menu_group="Game;" \
+	--binary-name="%{name}" \
 #	--menu-name="OpenTTD" \
+#	--data-dir="share\games\%{name}" \
 #	--doc-dir="share\doc\%{name}" \
 #	--icon-dir="share/pixmaps" \
 #	--icon-theme-dir="share/icons/hicolor" \
 #	--man-dir="share/man/man6" \
-#	--menu-dir="share/applications"
-
+#	--menu-dir="share/applications" \
+	--enable-debug=0 \
+#	--menu_group="Game;" \
+	--with-sdl \
+	--with-zlib \
+	--with-png \
+	--with-freetype \
+	--with-fontconfig \
+	--with-icu \
+	--enable-strip
 make %{?_smp_mflags}

 %install
+rm -rf "%{buildroot}"
 make install INSTALL_DIR="%{buildroot}"

 # Validate menu entrys (vendor specific)
 %if %{_vendor} == "redhat" || %{_vendor}=="fedora"
 desktop-file-install \
+#	--delete-original \
 	--vendor="%{_vendor}" \
 	--remove-key Version \
 	--dir="%{buildroot}/%{_datadir}/applications/" \
-	"%{buildroot}/%{_datadir}/applications/%{name}.desktop" \
-#	--delete-original
-%endif
-%if %{_vendor}=="suse"
-%__cat > %{name}.desktop << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=OpenTTD
-Comment=OpenTTD - A clone of the Microprose game 'Transport Tycoon Deluxe'
-GenericName=OpenTTD
-Type=Application
-Terminal=false
-Exec=%{name}
-Icon=%{name}
-Categories=Game;StrategyGame;
-EOF
-%suse_update_desktop_file -i %{name} Game StrategyGame
+	"%{buildroot}/%{_datadir}/applications/%{name}.desktop"
 %endif

 %clean
-#rm -rf "%{buildroot}"
+rm -rf "%{buildroot}"

 %post
 # Update the icon cache (vendor specific)
-%if %{_vendor}=="mandriva"
+%if %{_vendor}=="MandrakeSoft" || %{_vendor}=="mandriva"
 %update_icon_cache hicolor
 %endif

@@ -149,7 +126,7 @@ fi

 %postun
 # Update the icon cache (vendor specific)
-%if %{_vendor}=="mandriva"
+%if %{_vendor}=="MandrakeSoft" || %{_vendor}=="mandriva"
 %update_icon_cache hicolor
 %endif

@@ -163,39 +140,37 @@ fi
 %files
 %defattr(-, root, games, -)
 %dir %{_datadir}/doc/%{name}
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/lang
-%dir %{_datadir}/%{name}/data
-%dir %{_datadir}/%{name}/gm
-%dir %{_datadir}/%{name}/scripts
+%dir %{_datadir}/games/%{name}
+%dir %{_datadir}/games/%{name}/lang
+%dir %{_datadir}/games/%{name}/data
+%dir %{_datadir}/games/%{name}/gm
 %attr(755, root, games) %{_bindir}/%{name}
 %{_datadir}/doc/%{name}/*
-%{_datadir}/%{name}/lang/*
-%{_datadir}/%{name}/data/*
-%{_datadir}/%{name}/scripts/*
-%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/games/%{name}/lang/*
+%{_datadir}/games/%{name}/data/*
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/*
-%{_datadir}/icons/*
-%doc %{_mandir}/man6/%{name}.6.*
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%doc %{_mandir}/man6/%{name}.6.gz

 %changelog
-* Sat Sep 26 2009 Marcel Gmür <ammler@openttdcoop.org> - 0.7.2
- no subfolder games for datadir
- cleanup: no post and postun anymore
- Recommends: opengfx (for suse and mandriva)
- add SUSE support
-
 * Mon Oct 20 2008 Benedikt Brüggemeier <skidd13@openttd.org>
+
 - Added libicu dependency

 * Thu Sep 23 2008 Benedikt Brüggemeier <skidd13@openttd.org>
+
 - Merged both versions of the spec file

 * Fri Aug 29 2008 Jonathan Coome <maedhros@openttd.org>
+
 - Rewrite spec file from scratch.

 * Sat Aug 02 2008 Benedikt Brüggemeier <skidd13@openttd.org>
+
 - Updated spec file

 * Thu Mar 27 2008 Denis Burlaka <burlaka@yandex.ru>
+
 - Universal spec file
+
@@ -1,11 +1,11 @@
 !define APPNAME "OpenTTD"   ; Define application name
-!define APPVERSION "0.7.5"  ; Define application version
-!define APPVERSIONINTERNAL "0.7.5.0" ; Define application version in X.X.X.X
-!define INSTALLERVERSION 72 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define APPVERSION "0.7.0"  ; Define application version
+!define INSTALLERVERSION 54 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
 !include ${VERSION_INCLUDE}

 !define APPURLLINK "http://www.openttd.org"
-!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
+!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}-beta1"
+!define APPVERSIONINTERNAL "${APPVERSION}.0" ; Needs to be of the format X.X.X.X

 !define MUI_ICON "..\..\..\media\openttd.ico"
 !define MUI_UNICON "..\..\..\media\openttd.ico"
@@ -71,6 +71,10 @@ Page custom SelectCDEnter SelectCDExit ": TTD folder"

 !insertmacro MUI_PAGE_INSTFILES

+;-----------------------------------------------------
+; New custom page to show UNICODE and MSLU information
+Page custom ShowWarningsPage
+
 !define MUI_FINISHPAGE_TITLE_3LINES
 !define MUI_FINISHPAGE_RUN_TEXT "Run ${APPNAMEANDVERSION} now!"
 !define MUI_FINISHPAGE_RUN "$INSTDIR\openttd.exe"
@@ -108,6 +112,13 @@ Section "!OpenTTD" Section1
 	File ${PATH_ROOT}bin\data\*.grf
 	File ${PATH_ROOT}bin\data\*.obg
 	File ${PATH_ROOT}bin\data\opntitle.dat
+	; Copy scenario files (don't choke if they don't exist)
+	SetOutPath "$INSTDIR\scenario\"
+	File /nonfatal ${PATH_ROOT}bin\scenario\*.scn
+
+	; Copy heightmap files (don't choke if they don't exist)
+	SetOutPath "$INSTDIR\scenario\heightmap\"
+	File /nonfatal ${PATH_ROOT}bin\scenario\heightmap\*.*

 	; Copy the scripts
 	SetOutPath "$INSTDIR\scripts\"
@@ -129,6 +140,7 @@ Section "!OpenTTD" Section1
 	; Delete old files from the main dir. they are now placed in data/ and lang/
 	Delete "$INSTDIR\*.lng"
 	Delete "$INSTDIR\*.grf"
+	Delete "$INSTDIR\*.obg"
 	Delete "$INSTDIR\sample.cat"
 	Delete "$INSTDIR\ttd.exe"

@@ -367,6 +379,23 @@ WinNT:
 	ClearErrors
 FunctionEnd

+;----------------------------------------------------------------------------------
+; Custom page function to show notices for running OpenTTD (only for win32 systems)
+; We have extracted this custom page as Notice in the .onInit function
+Function ShowWarningsPage
+	Call GetWindowsVersion
+	Pop $R0
+	; Don't show the UNICODE notice if the installer is run on Win9x systems
+	StrCmp $R0 "win9x" 0 WinNT
+	Abort
+WinNT:
+	!insertmacro MUI_HEADER_TEXT "Installation Complete" "Important notices for OpenTTD usage."
+	!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "notice.ini" "Notice"
+	!insertmacro MUI_INSTALLOPTIONS_INITDIALOG "Notice"
+	ClearErrors
+	!insertmacro MUI_INSTALLOPTIONS_SHOW
+FunctionEnd
+
 ;-------------------------------------------------------------------------------
 ; Determine windows version, returns "win9x" if Win9x/Me or "winnt" on the stack
 Function GetWindowsVersion
@@ -0,0 +1,30 @@
+; Ini file generated by the HM NIS Edit IO designer.
+[Settings]
+NumFields=3
+CancelEnabled=0
+
+[Field 1]
+Type=Groupbox
+Text=UNICODE support
+Left=8
+Right=292
+Top=0
+Bottom=75
+
+[Field 2]
+Type=Label
+Text=This version of OpenTTD has support for UNICODE, allowing users to use non-ASCII character sets such as Russian or Japanese.\r\nSelecting such a language will result in an unusable and garbled interface. You will need to specify a font that has support for these characters in openttd.cfg, or alternatively use an appropiate grf file.\r\n\r\nFor more information please refer to the readme or the wiki.
+Left=13
+Right=284
+Top=9
+Bottom=65
+
+[Field 3]
+Type=Link
+Text=OpenTTD wiki
+Left=238
+Right=284
+Top=64
+Bottom=72
+State=http://wiki.openttd.org/index.php/Unicode
+
@@ -16,10 +16,10 @@ End Sub

 Sub UpdateFile(modified, revision, version, cur_date, filename)
 	FSO.CopyFile filename & ".in", filename
-	FindReplaceInFile filename, "!!MODIFIED!!", modified
-	FindReplaceInFile filename, "!!REVISION!!", revision
-	FindReplaceInFile filename, "!!VERSION!!", version
-	FindReplaceInFile filename, "!!DATE!!", cur_date
+	FindReplaceInFile filename, "@@MODIFIED@@", modified
+	FindReplaceInFile filename, "@@REVISION@@", revision
+	FindReplaceInFile filename, "@@VERSION@@", version
+	FindReplaceInFile filename, "@@DATE@@", cur_date
 End Sub

 Sub UpdateFiles(version)
@@ -278,7 +278,7 @@ Function CheckFile(filename)
 End Function

 Dim version
-version = DetermineSVNVersion
+version = "0.7.0-beta1"
 If Not (IsCachedVersion(version) And CheckFile("../src/rev.cpp") And CheckFile("../src/ottdres.rc")) Then
 	UpdateFiles version
 End If
@@ -153,7 +153,7 @@ load_lang_data() {
 					Name=\"VCCustomBuildTool\"
 					Description=\"Generating "$i" language file\"
 					CommandLine=\"..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang &quot;\$(InputPath)&quot;&#x0D;&#x0A;\"
-					AdditionalDependencies=\"..\\src\\lang\\english.txt\"
+					AdditionalDependencies=\"\"
 					Outputs=\"..\\bin\\lang\\"$i".lng\"
 				/>
 			</FileConfiguration>
@@ -203,7 +203,7 @@ Function load_lang_data(dir)
 			& vbCrLf & "					Name=" & Chr(34) & "VCCustomBuildTool" & Chr(34) _
 			& vbCrLf & "					Description=" & Chr(34) & "Generating " & file & " language file" & Chr(34) _
 			& vbCrLf & "					CommandLine=" & Chr(34) & "..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;" & Chr(34) _
-			& vbCrLf & "					AdditionalDependencies=" & Chr(34) & "..\src\lang\english.txt" & Chr(34) _
+			& vbCrLf & "					AdditionalDependencies=" & Chr(34) & Chr(34) _
 			& vbCrLf & "					Outputs=" & Chr(34) & "..\bin\lang\" & file & ".lng" & Chr(34) _
 			& vbCrLf & "				/>" _
 			& vbCrLf & "			</FileConfiguration>" _
@@ -56,7 +56,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating afrikaans language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\afrikaans.lng"
 				/>
 			</FileConfiguration>
@@ -71,7 +71,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating arabic_egypt language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\arabic_egypt.lng"
 				/>
 			</FileConfiguration>
@@ -86,7 +86,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating brazilian_portuguese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\brazilian_portuguese.lng"
 				/>
 			</FileConfiguration>
@@ -101,7 +101,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating bulgarian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\bulgarian.lng"
 				/>
 			</FileConfiguration>
@@ -116,7 +116,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating catalan language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\catalan.lng"
 				/>
 			</FileConfiguration>
@@ -131,7 +131,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating croatian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\croatian.lng"
 				/>
 			</FileConfiguration>
@@ -146,7 +146,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating czech language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\czech.lng"
 				/>
 			</FileConfiguration>
@@ -161,7 +161,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating danish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\danish.lng"
 				/>
 			</FileConfiguration>
@@ -176,7 +176,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating dutch language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\dutch.lng"
 				/>
 			</FileConfiguration>
@@ -191,7 +191,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating english language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\english.lng"
 				/>
 			</FileConfiguration>
@@ -206,7 +206,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating english_US language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\english_US.lng"
 				/>
 			</FileConfiguration>
@@ -221,7 +221,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating esperanto language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\esperanto.lng"
 				/>
 			</FileConfiguration>
@@ -236,7 +236,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating estonian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\estonian.lng"
 				/>
 			</FileConfiguration>
@@ -251,7 +251,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating finnish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\finnish.lng"
 				/>
 			</FileConfiguration>
@@ -266,7 +266,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating french language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\french.lng"
 				/>
 			</FileConfiguration>
@@ -281,7 +281,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating galician language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\galician.lng"
 				/>
 			</FileConfiguration>
@@ -296,7 +296,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating german language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\german.lng"
 				/>
 			</FileConfiguration>
@@ -311,7 +311,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating hebrew language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\hebrew.lng"
 				/>
 			</FileConfiguration>
@@ -326,7 +326,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating hungarian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\hungarian.lng"
 				/>
 			</FileConfiguration>
@@ -341,7 +341,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating icelandic language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\icelandic.lng"
 				/>
 			</FileConfiguration>
@@ -356,7 +356,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating indonesian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\indonesian.lng"
 				/>
 			</FileConfiguration>
@@ -371,7 +371,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating italian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\italian.lng"
 				/>
 			</FileConfiguration>
@@ -386,7 +386,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating japanese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\japanese.lng"
 				/>
 			</FileConfiguration>
@@ -401,7 +401,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating korean language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\korean.lng"
 				/>
 			</FileConfiguration>
@@ -416,7 +416,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating latvian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\latvian.lng"
 				/>
 			</FileConfiguration>
@@ -431,26 +431,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating lithuanian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\lithuanian.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\luxembourgish.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating luxembourgish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\luxembourgish.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\norwegian_bokmal.txt"
 			>
@@ -461,7 +446,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_bokmal language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\norwegian_bokmal.lng"
 				/>
 			</FileConfiguration>
@@ -476,11 +461,26 @@
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_nynorsk language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\norwegian_nynorsk.lng"
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\lang\origveh.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating origveh language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\origveh.lng"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\src\lang\piglatin.txt"
 			>
@@ -491,7 +491,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating piglatin language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\piglatin.lng"
 				/>
 			</FileConfiguration>
@@ -506,7 +506,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating polish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\polish.lng"
 				/>
 			</FileConfiguration>
@@ -521,7 +521,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating portuguese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\portuguese.lng"
 				/>
 			</FileConfiguration>
@@ -536,7 +536,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating romanian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\romanian.lng"
 				/>
 			</FileConfiguration>
@@ -551,26 +551,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating russian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\russian.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\serbian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating serbian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\serbian.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\simplified_chinese.txt"
 			>
@@ -581,7 +566,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating simplified_chinese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\simplified_chinese.lng"
 				/>
 			</FileConfiguration>
@@ -596,7 +581,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating slovak language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\slovak.lng"
 				/>
 			</FileConfiguration>
@@ -611,7 +596,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating slovenian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\slovenian.lng"
 				/>
 			</FileConfiguration>
@@ -626,7 +611,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating spanish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\spanish.lng"
 				/>
 			</FileConfiguration>
@@ -641,7 +626,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating swedish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\swedish.lng"
 				/>
 			</FileConfiguration>
@@ -656,7 +641,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating traditional_chinese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\traditional_chinese.lng"
 				/>
 			</FileConfiguration>
@@ -671,7 +656,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating turkish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\turkish.lng"
 				/>
 			</FileConfiguration>
@@ -686,7 +671,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating ukrainian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\ukrainian.lng"
 				/>
 			</FileConfiguration>
@@ -701,7 +686,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating welsh language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\welsh.lng"
 				/>
 			</FileConfiguration>
@@ -57,7 +57,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating afrikaans language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\afrikaans.lng"
 				/>
 			</FileConfiguration>
@@ -72,7 +72,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating arabic_egypt language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\arabic_egypt.lng"
 				/>
 			</FileConfiguration>
@@ -87,7 +87,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating brazilian_portuguese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\brazilian_portuguese.lng"
 				/>
 			</FileConfiguration>
@@ -102,7 +102,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating bulgarian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\bulgarian.lng"
 				/>
 			</FileConfiguration>
@@ -117,7 +117,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating catalan language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\catalan.lng"
 				/>
 			</FileConfiguration>
@@ -132,7 +132,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating croatian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\croatian.lng"
 				/>
 			</FileConfiguration>
@@ -147,7 +147,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating czech language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\czech.lng"
 				/>
 			</FileConfiguration>
@@ -162,7 +162,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating danish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\danish.lng"
 				/>
 			</FileConfiguration>
@@ -177,7 +177,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating dutch language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\dutch.lng"
 				/>
 			</FileConfiguration>
@@ -192,7 +192,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating english language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\english.lng"
 				/>
 			</FileConfiguration>
@@ -207,7 +207,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating english_US language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\english_US.lng"
 				/>
 			</FileConfiguration>
@@ -222,7 +222,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating esperanto language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\esperanto.lng"
 				/>
 			</FileConfiguration>
@@ -237,7 +237,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating estonian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\estonian.lng"
 				/>
 			</FileConfiguration>
@@ -252,7 +252,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating finnish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\finnish.lng"
 				/>
 			</FileConfiguration>
@@ -267,7 +267,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating french language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\french.lng"
 				/>
 			</FileConfiguration>
@@ -282,7 +282,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating galician language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\galician.lng"
 				/>
 			</FileConfiguration>
@@ -297,7 +297,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating german language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\german.lng"
 				/>
 			</FileConfiguration>
@@ -312,7 +312,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating hebrew language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\hebrew.lng"
 				/>
 			</FileConfiguration>
@@ -327,7 +327,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating hungarian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\hungarian.lng"
 				/>
 			</FileConfiguration>
@@ -342,7 +342,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating icelandic language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\icelandic.lng"
 				/>
 			</FileConfiguration>
@@ -357,7 +357,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating indonesian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\indonesian.lng"
 				/>
 			</FileConfiguration>
@@ -372,7 +372,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating italian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\italian.lng"
 				/>
 			</FileConfiguration>
@@ -387,7 +387,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating japanese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\japanese.lng"
 				/>
 			</FileConfiguration>
@@ -402,7 +402,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating korean language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\korean.lng"
 				/>
 			</FileConfiguration>
@@ -417,7 +417,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating latvian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\latvian.lng"
 				/>
 			</FileConfiguration>
@@ -432,26 +432,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating lithuanian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\lithuanian.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\luxembourgish.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating luxembourgish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\luxembourgish.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\norwegian_bokmal.txt"
 			>
@@ -462,7 +447,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_bokmal language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\norwegian_bokmal.lng"
 				/>
 			</FileConfiguration>
@@ -477,11 +462,26 @@
 					Name="VCCustomBuildTool"
 					Description="Generating norwegian_nynorsk language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\norwegian_nynorsk.lng"
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\lang\origveh.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating origveh language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\origveh.lng"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\src\lang\piglatin.txt"
 			>
@@ -492,7 +492,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating piglatin language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\piglatin.lng"
 				/>
 			</FileConfiguration>
@@ -507,7 +507,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating polish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\polish.lng"
 				/>
 			</FileConfiguration>
@@ -522,7 +522,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating portuguese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\portuguese.lng"
 				/>
 			</FileConfiguration>
@@ -537,7 +537,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating romanian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\romanian.lng"
 				/>
 			</FileConfiguration>
@@ -552,26 +552,11 @@
 					Name="VCCustomBuildTool"
 					Description="Generating russian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\russian.lng"
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\serbian.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating serbian language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
-					Outputs="..\bin\lang\serbian.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\simplified_chinese.txt"
 			>
@@ -582,7 +567,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating simplified_chinese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\simplified_chinese.lng"
 				/>
 			</FileConfiguration>
@@ -597,7 +582,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating slovak language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\slovak.lng"
 				/>
 			</FileConfiguration>
@@ -612,7 +597,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating slovenian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\slovenian.lng"
 				/>
 			</FileConfiguration>
@@ -627,7 +612,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating spanish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\spanish.lng"
 				/>
 			</FileConfiguration>
@@ -642,7 +627,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating swedish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\swedish.lng"
 				/>
 			</FileConfiguration>
@@ -657,7 +642,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating traditional_chinese language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\traditional_chinese.lng"
 				/>
 			</FileConfiguration>
@@ -672,7 +657,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating turkish language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\turkish.lng"
 				/>
 			</FileConfiguration>
@@ -687,7 +672,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating ukrainian language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\ukrainian.lng"
 				/>
 			</FileConfiguration>
@@ -702,7 +687,7 @@
 					Name="VCCustomBuildTool"
 					Description="Generating welsh language file"
 					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt"
+					AdditionalDependencies=""
 					Outputs="..\bin\lang\welsh.lng"
 				/>
 			</FileConfiguration>
@@ -103,8 +103,6 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				OptimizeForWindows98="1"
 				TargetMachine="1"
@@ -203,8 +201,6 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -316,8 +312,6 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				OptimizeForWindows98="1"
 				TargetMachine="17"
@@ -419,8 +413,6 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -955,10 +947,6 @@
 				RelativePath=".\..\src\driver.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\economy_base.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\economy_func.h"
 				>
@@ -1983,10 +1971,6 @@
 				RelativePath=".\..\src\ship_cmd.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\signs_cmd.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\station_cmd.cpp"
 				>
@@ -2019,18 +2003,10 @@
 				RelativePath=".\..\src\unmovable_cmd.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\vehicle_cmd.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\water_cmd.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\waypoint_cmd.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Save/Load handlers"
@@ -2563,10 +2539,6 @@
 				RelativePath=".\..\src\ai\api\ai_cargolist.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_changelog.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_company.hpp"
 				>
@@ -2635,10 +2607,6 @@
 				RelativePath=".\..\src\ai\api\ai_industrytypelist.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_info_docs.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_list.hpp"
 				>
@@ -2679,10 +2647,6 @@
 				RelativePath=".\..\src\ai\api\ai_sign.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_signlist.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_station.hpp"
 				>
@@ -2735,14 +2699,6 @@
 				RelativePath=".\..\src\ai\api\ai_vehiclelist.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_waypoint.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_waypointlist.hpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="AI API Implementation"
@@ -2887,10 +2843,6 @@
 				RelativePath=".\..\src\ai\api\ai_sign.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_signlist.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_station.cpp"
 				>
@@ -2939,14 +2891,6 @@
 				RelativePath=".\..\src\ai\api\ai_vehiclelist.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_waypoint.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_waypointlist.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Blitters"
@@ -103,8 +103,6 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				OptimizeForWindows98="1"
 				TargetMachine="1"
@@ -203,8 +201,6 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -316,8 +312,6 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				OptimizeForWindows98="1"
 				TargetMachine="17"
@@ -419,8 +413,6 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -104,8 +104,6 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -202,8 +200,6 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -314,8 +310,6 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				TargetMachine="17"
 			/>
@@ -416,8 +410,6 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -952,10 +944,6 @@
 				RelativePath=".\..\src\driver.h"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\economy_base.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\economy_func.h"
 				>
@@ -1980,10 +1968,6 @@
 				RelativePath=".\..\src\ship_cmd.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\signs_cmd.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\station_cmd.cpp"
 				>
@@ -2016,18 +2000,10 @@
 				RelativePath=".\..\src\unmovable_cmd.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\vehicle_cmd.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\water_cmd.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\waypoint_cmd.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Save/Load handlers"
@@ -2560,10 +2536,6 @@
 				RelativePath=".\..\src\ai\api\ai_cargolist.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_changelog.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_company.hpp"
 				>
@@ -2632,10 +2604,6 @@
 				RelativePath=".\..\src\ai\api\ai_industrytypelist.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_info_docs.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_list.hpp"
 				>
@@ -2676,10 +2644,6 @@
 				RelativePath=".\..\src\ai\api\ai_sign.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_signlist.hpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_station.hpp"
 				>
@@ -2732,14 +2696,6 @@
 				RelativePath=".\..\src\ai\api\ai_vehiclelist.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_waypoint.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_waypointlist.hpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="AI API Implementation"
@@ -2884,10 +2840,6 @@
 				RelativePath=".\..\src\ai\api\ai_sign.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_signlist.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_station.cpp"
 				>
@@ -2936,14 +2888,6 @@
 				RelativePath=".\..\src\ai\api\ai_vehiclelist.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_waypoint.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\ai\api\ai_waypointlist.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Blitters"
@@ -104,8 +104,6 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -202,8 +200,6 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -314,8 +310,6 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				TargetMachine="17"
 			/>
@@ -416,8 +410,6 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				StackReserveSize="1048576"
-				StackCommitSize="1048576"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2009-12-23
-Release version: 0.7.5
+Last updated:    2009-02-16
+Release version: 0.7.0-beta1
 ------------------------------------------------------------------------


@@ -17,7 +17,6 @@ Table of Contents:
 5.0) OpenTTD features
 6.0) Configuration File
 7.0) Compiling
- * 7.1) Required/optional libraries
 8.0) Translating
 * 8.1 Guidelines
 * 8.2 Translation
@@ -49,41 +48,23 @@ http://forum.openttd.org/

 2.1) Reporting Bugs:
 ---- ---------------
-First of all, check whether the bug is not already known. Do this by looking
-through the file called 'known-bugs.txt' which is distributed with OpenTTD
-like this readme.
+To report a bug, please create a Flyspray account and follow the bugs
+link from our homepage. Please make sure the bug is reproducible and
+still occurs in the latest daily build or the current SVN version. Also
+please look through the existing bug reports briefly to see whether the bug
+is not already known.

-For tracking our bugs we are using a bug tracker called Flyspray. You can find
-the tracker at http://bugs.openttd.org/. Before actually reporting take a look
-through the already reported bugs there to see if the bug is already known.
-The 'known-bugs.txt' file might be a bit outdated at the moment you are
-reading it as only bugs known before the release are documented there. Also
-look through the recently closed bugs.
+The Flyspray project page URL is: http://bugs.openttd.org/

-When you are sure it is not already reported you should:
- * Make sure you are running a recent version, i.e. run the latest stable or
-   nightly based on where you found the bug.
- * Make sure you are not running a non-official binary, like a patch pack.
-   When you are playing with a patch pack you should report any bugs to the
-   forum thread related to that patch pack.
- * Make it reproducable for the developers. In other words, create a savegame
-   in which you can reproduce the issue once loaded. It is very useful to give
-   us the crash.dmp, crash.sav and crash.log which are created on crashes.
- * Check whether the bug is already reported on our bug tracker. This includes
-   searching for recently closed bug reports as the bug might already be fixed.
-
-After you have done all that you can report the bug. Please include the
-following information in your bug report:
- * OpenTTD version (PLEASE test the latest SVN/nightly build)
- * Bug details, including instructions how to reproduce it
- * Platform (Win32, Linux, FreeBSD, ...) and compiler (including version) if
-   you compiled OpenTTD yourself.
- * Attach a saved game *and* a screenshot if possible
- * If this bug only occurred recently please note the last version without
-   the bug and the first version including the bug. That way we can fix it
-   quicker by looking at the changes made.
- * Attach crash.dmp, crash.log and crash.sav. These files are usually created
-   next to your openttd.cfg. The crash handler will tell you the location.
+Please include the following information in your bug report:
+        - OpenTTD version (PLEASE test the latest SVN/nightly build)
+        - Bug details, including instructions how to reproduce it
+        - Platform and compiler (Win32, Linux, FreeBSD, ...)
+        - Attach a saved game *and* a screenshot if possible
+        - If this bug only occurred recently please note the last
+          version without the bug and the first version including
+          the bug. That way we can fix it quicker by looking at the
+          changes made.

 2.2) Reporting Desyncs:
 ---- ------------------
@@ -175,15 +156,6 @@ If you want savegames and screenshots in the directory where the OpenTTD binary
 resides, simply have your config file in that location. But if you remove this
 config file, savegames will still be in this directory (see notes in section 4.2)

-OpenTTD comes without AIs, so if you want to play with AIs you have to download
-them. The easiest way is via the "Check Online Content" button in the main menu.
-You can select some AIs that you think are compatible with your playing style.
-Another way is manually downloading the AIs from the forum although then you
-need to make sure that you install all the required AI libraries too; they get
-automatically selected (and downloaded) if you get the AIs via the "Check
-Online Content". If you do not have an AI but have configured OpenTTD to start
-an AI a message will be shown that the 'dummy' AI has been started.
-
 4.1) (Required) 3rd party files:
 ---- ---------------------------

@@ -217,19 +189,6 @@ Do NOT copy files included with OpenTTD into "shared" directories (explained in
 the following sections) as sooner or later you will run into graphical glitches
 when using other versions of the game.

-If you want AIs use the in-game content downloader. If for some reason that is
-not possible or you want to use an AI that has not been uploaded to the content
-download system download the tar file and place it in the ai/ directory. If the
-AI needs libraries you'll have to download those too and put them in the
-ai/library/ directory. All AIs and AI Libraries that have been uploaded to
-the content download system can be found at http://noai.openttd.org/downloads/
-The AIs and libraries can be found their in the form of .tar.gz packages.
-OpenTTD can read inside tar files but it does not extract .tar.gz files by
-itself.
-To figure out which libraries you need for an AI you have to start the AI and
-wait for an error message to pop up. The error message will tell you
-"couldn't find library 'lib-name'". Download that library and try again.
-
 4.2) OpenTTD directories
 ---- -------------------------------

@@ -292,11 +251,9 @@ features known from TTDPatch (http://www.ttdpatch.net/).

 Several important non-standard controls:

-* Ctrl makes many commands more powerful. For example Ctrl clicking on signals
-  with the build signal tool changes their behaviour.
+* Use Ctrl to place semaphore signals
 * Ingame console. More information at
  http://wiki.openttd.org/index.php/Console
-* Right clicking shows tooltips


 5.1) Logging of potentially dangerous actions:
@@ -334,9 +291,6 @@ OpenTTD in debug mode.
 The configuration file for OpenTTD (openttd.cfg) is in a simple Windows-like
 .INI format. It's mostly undocumented. Almost all settings can be changed
 ingame by using the 'Advanced Settings' window.
-When you can not find openttd.cfg you should look in the directories as
-described in section 4.2. If you do not have an openttd.cfg OpenTTD will
-create one after closing.


 7.0) Compiling:
@@ -355,12 +309,18 @@ Windows:
  You can also build it using the Makefile with MSYS/MinGW or Cygwin/MinGW.
  Please read the Makefile for more information.

-Solaris, FreeBSD, OpenBSD:
-  Use "gmake", but do a "./configure" before the first build.
+Solaris 10:
+  You need g++ (version 3 or higher), together with SDL. Installation of
+  libpng and zlib is recommended. For the first build it is required
+  to execute "bash configure" first. Note that ./configure does not work
+  yet. It is likely that you don't have a strip binary, so use the
+  --disable-strip option in that case. Fontconfig (>2.3.0) and freetype
+  are optional. "make run" will then run the program.

-Linux/Unix:
+Unix:
  OpenTTD can be built with GNU "make". On non-GNU systems it's called "gmake".
  However, for the first build one has to do a "./configure" first.
+  Note that you need SDL-devel 1.2.5 (or higher) to compile OpenTTD.

 MacOS X:
  Use "make" or Xcode (which will then call make for you)
@@ -372,6 +332,15 @@ MacOS X:
 BeOS:
  Use "make", but do a "./configure" before the first build.

+FreeBSD:
+  You need the port devel/sdl12 for a non-dedicated build.
+  graphics/png is optional for screenshots in the PNG format.
+  Use "gmake", but do a "./configure" before the first build.
+
+OpenBSD:
+  Use "gmake", but do a "./configure" before the first build.
+  Note that you need the port devel/sdl to compile OpenTTD.
+
 MorphOS:
  Use "make". However, for the first build one has to do a "./configure" first.
  Note that you need the MorphOS SDK, latest libnix updates (else C++ parts of
@@ -392,8 +361,6 @@ DOS:
  will be generated that does not need cwsdpmi.exe by adding the cswdstub.exe
  to the created OpenTTD binary.

-7.1) Required/optional libraries:
---- -------------------
 The following libraries are used by OpenTTD for:
  - libSDL/liballegro: hardware access (video, sound, mouse)
  - zlib: (de)compressing of savegames
@@ -402,18 +369,15 @@ The following libraries are used by OpenTTD for:
  - libfontconfig: searching for fonts, resolving font names to actual fonts
  - libicu: handling of right-to-left scripts (e.g. Arabic and Persian)

-OpenTTD does not require any of the libraries to be present, but without
-zlib you cannot open most savegames or use the content downloading system.
-Without libSDL/liballegro on non-Windows and non-MacOS X machines you have
-no graphical user interface; you would be building a dedicated server.
-
 8.0) Translating:
 ---- -------------------
 See http://www.openttd.org/development for up-to-date information.

 The use of the online Translator service, located at
-http://translator.openttd.org/, is highly encouraged. For getting an account
-simply follow the guidelines in the FAQ of the translator website.
+http://translator2.openttd.org/, is highly encouraged. For a username/password
+combo you should contact the development team, either by mail, IRC or the
+forums. The system is straightforward to use, and if you have any problems,
+read the online help located there.

 If for some reason the website is down for a longer period of time, the
 information below might be of help.
@@ -498,47 +462,42 @@ put them in the data/ folder and you're set to go.
 X.X) Credits:
 ---- --------
 The OpenTTD team (in alphabetical order):
-  Albert Hofkamp (Alberth)       - GUI expert
  Jean-Francois Claeys (Belugas) - GUI, newindustries and more
  Bjarni Corfitzen (Bjarni)      - MacOSX port, coder and vehicles
  Matthijs Kooijman (blathijs)   - Pathfinder-guru, pool rework
  Victor Fischer (Celestar)      - Programming everywhere you need him to
  Christoph Elsenhans (frosch)   - General coding
-  Loïc Guilloux (glx)            - Windows Expert
+  Loïc Guilloux (glx)            - General coding
+  Jaroslav Mazanec (KUDr)        - YAPG (Yet Another Pathfinder God) ;)
+  Jonathan Coome (Maedhros)      - High priest of the NewGRF Temple
  Michael Lutz (michi_cc)        - Path based signals
+  Attila Bán (MiHaMiX)           - WebTranslator, Nightlies, Wiki and bugtracker host
  Owen Rudge (orudge)            - Forum host, OS/2 port
  Peter Nelson (peter1138)       - Spiritual descendant from newGRF gods
  Remko Bijker (Rubidium)        - Lead coder and way more
-  Zdeněk Sojka (SmatZ)           - Bug finder and fixer
-  Thijs Marinussen (Yexo)        - AI Framework
+  Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker
+  Zdenek Sojka (SmatZ)           - Bug finder and fixer

 Inactive Developers:
  Tamás Faragó (Darkvater)       - Ex-Lead coder
-  Jaroslav Mazanec (KUDr)        - YAPG (Yet Another Pathfinder God) ;)
-  Jonathan Coome (Maedhros)      - High priest of the NewGRF Temple
-  Attila Bán (MiHaMiX)           - WebTranslator 1 and 2
  Christoph Mallon (Tron)        - Programmer, code correctness police

 Retired Developers:
  Ludvig Strigeus (ludde)        - OpenTTD author, main coder (0.1 - 0.3.3)
  Serge Paquet (vurlix)          - Assistant project manager, coder (0.1 - 0.3.3)
  Dominik Scherer (dominik81)    - Lead programmer, GUI expert (0.3.0 - 0.3.6)
-  Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker
-  Patric Stout (TrueLight)       - Programmer (0.3 - pre0.7), sys op (active)
+  Patric Stout (TrueLight)       - Programmer, webhoster (0.3 - pre0.6)

 Thanks to:
  Josef Drexler                  - For his great work on TTDPatch.
  Marcin Grzegorczyk             - For his TTDPatch work and documentation of TTD internals and graphics (signals and track foundations)
-  Petr Baudiš (pasky)            - Many patches, newgrf support, etc.
+  Petr Baudis (pasky)            - Many patches, newgrf support, etc.
  Simon Sasburg (HackyKid)       - For the many bugfixes he has blessed us with
  Stefan Meißner (sign_de)       - For his work on the console
  Mike Ragsdale                  - OpenTTD installer
  Cian Duffy (MYOB)              - BeOS port / manual writing
  Christian Rosentreter (tokai)  - MorphOS / AmigaOS port
  Richard Kempton (RichK67)      - Additional airports, initial TGP implementation
-  Alberto Demichelis             - Squirrel scripting language
-  Markus F.X.J. Oberhumer        - MiniLZO for loading old savegames
-  L. Peter Deutsch               - MD5 implementation
  Michael Blunck                 - For revolutionizing TTD with awesome graphics
  George                         - Canal graphics
  David Dallaston (Pikka)        - Tram tracks
@@ -167,7 +167,6 @@ direction_func.h
 direction_type.h
 music/dmusic.h
 driver.h
-economy_base.h
 economy_func.h
 economy_type.h
 effectvehicle_base.h
@@ -442,7 +441,6 @@ rail_cmd.cpp
 road_cmd.cpp
 roadveh_cmd.cpp
 ship_cmd.cpp
-signs_cmd.cpp
 station_cmd.cpp
 terraform_cmd.cpp
 timetable_cmd.cpp
@@ -451,9 +449,7 @@ train_cmd.cpp
 tree_cmd.cpp
 tunnelbridge_cmd.cpp
 unmovable_cmd.cpp
-vehicle_cmd.cpp
 water_cmd.cpp
-waypoint_cmd.cpp

 # Save/Load handlers
 saveload/afterload.cpp
@@ -594,7 +590,6 @@ ai/api/ai_bridge.hpp
 ai/api/ai_bridgelist.hpp
 ai/api/ai_cargo.hpp
 ai/api/ai_cargolist.hpp
-ai/api/ai_changelog.hpp
 ai/api/ai_company.hpp
 ai/api/ai_controller.hpp
 ai/api/ai_date.hpp
@@ -612,7 +607,6 @@ ai/api/ai_industry.hpp
 ai/api/ai_industrylist.hpp
 ai/api/ai_industrytype.hpp
 ai/api/ai_industrytypelist.hpp
-ai/api/ai_info_docs.hpp
 ai/api/ai_list.hpp
 ai/api/ai_log.hpp
 ai/api/ai_map.hpp
@@ -623,7 +617,6 @@ ai/api/ai_rail.hpp
 ai/api/ai_railtypelist.hpp
 ai/api/ai_road.hpp
 ai/api/ai_sign.hpp
-ai/api/ai_signlist.hpp
 ai/api/ai_station.hpp
 ai/api/ai_stationlist.hpp
 ai/api/ai_subsidy.hpp
@@ -637,8 +630,6 @@ ai/api/ai_tunnel.hpp
 ai/api/ai_types.hpp
 ai/api/ai_vehicle.hpp
 ai/api/ai_vehiclelist.hpp
-ai/api/ai_waypoint.hpp
-ai/api/ai_waypointlist.hpp

 # AI API Implementation
 ai/api/ai_abstractlist.cpp
@@ -676,7 +667,6 @@ ai/api/ai_rail.cpp
 ai/api/ai_railtypelist.cpp
 ai/api/ai_road.cpp
 ai/api/ai_sign.cpp
-ai/api/ai_signlist.cpp
 ai/api/ai_station.cpp
 ai/api/ai_stationlist.cpp
 ai/api/ai_subsidy.cpp
@@ -689,8 +679,6 @@ ai/api/ai_townlist.cpp
 ai/api/ai_tunnel.cpp
 ai/api/ai_vehicle.cpp
 ai/api/ai_vehiclelist.cpp
-ai/api/ai_waypoint.cpp
-ai/api/ai_waypointlist.cpp

 # Blitters
 #if DEDICATED
@@ -1,41 +0,0 @@
-Squirrel 2.2.1 stable
--------------------------------------------------------
-What is in this distribution?
-
-squirrel
-	static library implementing the compiler and interpreter of the language
-
-sqstdlib
-	the standard utility libraries
-
-sq
-	stand alone interpreter
-
-doc
-	The manual
-
-etc
-	a minimalistic embedding sample
-
-samples
-	samples programs
-
-
-HOW TO COMPILE
---------------------------------------------------------
-GCC USERS
-.........................................................
-There is a very simple makefile that compiles all libraries and exes
-from the root of the project run 'make'
-
-for 32 bits systems
-
- $ make
-
-for 64 bits systems
-
- $ make sq64
-
-VISUAL C++ USERS
-.........................................................
-Open squirrel.dsw from the root project directory and build(dho!)
@@ -1,29 +0,0 @@
-Copyright (c) 2003-2008 Alberto Demichelis
-
-This software is provided 'as-is', without any
-express or implied warranty. In no event will the
-authors be held liable for any damages arising from
-the use of this software.
-
-Permission is granted to anyone to use this software
-for any purpose, including commercial applications,
-and to alter it and redistribute it freely, subject
-to the following restrictions:
-
-		1. The origin of this software must not be
-		misrepresented; you must not claim that
-		you wrote the original software. If you
-		use this software in a product, an
-		acknowledgment in the product
-		documentation would be appreciated but is
-		not required.
-
-		2. Altered source versions must be plainly
-		marked as such, and must not be
-		misrepresented as being the original
-		software.
-
-		3. This notice may not be removed or
-		altered from any source distribution.
-----------------------------------------------------
-END OF COPYRIGHT
@@ -1,327 +0,0 @@
-***version 2.2.2 stable***
-fixed some behaviour inconsistencies in thread.call() and thread.wakeup() (thx Mr.Accident)
-fixed coroutine error propagation
-fixed lingering return value from native function (thx Tom Leonard)
-fixed a bug if array.sort() is given a bad sort function (thx Tom Leonard)
-fixed some minor api bug
-added sq_arrayremove() and sq_arrayinsert()
-
-***2008-05-16          ***
-***version 2.2.1 stable***
-fixed a tailcall bug
-
-***2008-02-17          ***
-***version 2.2 stable  ***
-added _newslot metamethod in classes
-added enums added constants
-added sq_pushconsttable, sq_setconsttable
-added default param
-added octal literals(thx Dinosaur)
-fixed debug hook, 'calls' and 'returns' are properly notified in the same number.
-fixed a coroutine bug
-
-***2007-07-29          ***
-***version 2.1.2 stable***
-new behaviour for generators iteration using foreach
-now when a generator is iterated by foreach the value returned by a 'return val' statement
-will terminate the iteration but will not be returned as foreach iteration
-added sq_setclassudsize()
-added sq_clear()
-added table.clear(), array.clear()
-fixed sq_cmp() (thx jyuill)
-fixed minor bugs
-
-***2006-08-21	     ***
-***version 2.1.1 stable***
-vm refactoring
-optimized internal function memory layout
-new global symbol _version_ (is the version string)
-code size optimization for float literals(on 32bits float builts)
-now the raw ref API(sq_addref etc...) is fully reentrant.
-fixed a bug in sq_getdelegate() now pushes null if the object doesn't have a delegate(thx MatzeB)
-improved C reference performances in NO_GARBAGE_COLLECTOR builds
-sq_getlocal() now enumerates also outer values.
-fixed regexp library for GCC users.
-
-***2006-03-19	     ***
-***version 2.1 stable***
-added static class fields, new keyword static
-added 64bits architecture support
-added global slot _intsize_ int the base lib to recognize 32bits and 64bits builds
-added functions with fixed environment, closure.bindenv() built-in function
-all types except userdata and null implement the tostring() method
-string concatenation now invokes metamethod _tostring
-new metamethods for class objects _newmember and _inherited
-sq_call() sq_resume() sq_wakeupvm() have a new signature
-new C referencing implementation(scales more with the amount of references)
-refactored hash table
-new api functions sq_newslot(),sq_tobool(),sq_getbase(), sq_instanceof(), sq_bindenv()
-the api func sq_createslot was deprecated but still supported in form of C macro on top of sq_newslot
-sq_setreleasehook() now also works for classes
-stream.readstr() and stream.writestr() have been deprecated(this affects file and blob)
-fixed squirrel.h undeclared api calls
-fixed few minor bugs
-SQChar is now defined as wchar_t
-removed warning when building with -Wall -pedantic for GCC users
-added new std io function writeclosuretofile()
-added new std string functions strip(),rstrip(),lstrip() and split()
-regular expressions operators (+,*) now have more POSIX greedyness behaviour
-class constructors are now invoked as normal functions
-
-***2005-10-02	       ***
-***version 2.0.5 stable***
-fixed some 64bits incompatibilities (thx sarge)
-fixed minor bug in the stdlib format() function (thx Rick)
-fixed a bug in dofile() that was preventing to compile empty files
-added new API sq_poptop() & sq_getfreevariable()
-some performance improvements
-
-***2005-08-14	       ***
-***version 2.0.4 stable***
-weak references and related API calls
-added sq_objtobool()
-class instances memory policies improved(1 mem allocation for the whole instance)
-typetags are now declared as SQUserPointer instead of unsigned int
-first pass for 64bits compatibility
-fixed minor bug in the stdio stream
-fixed a bug in format()
-fixed bug in string.tointeger() and string.tofloat()
-
-***2005-06-24	       ***
-***version 2.0.3 stable***
-dofile() and loadfile() in the iolib now can decode ASCII, UTF8 files UCS2 big-endian and little-endian
-sq_setparamscheck() : now typemesk can check for null
-added string escape sequence \xhhhh
-fixed some C++ standard incompatibilities
-
-***2005-05-15	       ***
-***version 2.0.2 stable***
-performances improvements (expecially for GCC users)
-removed all dependencies from C++ exception handling
-various bugfixes
-
-***2005-04-12		 ***
-***version 2.0.1 stable***
-various bugfixes
-sq_setparamscheck() now allows spaces in the typemask
-
-***2005-04-03		 ***
-***version 2.0 stable***
-added API sq_gettypetag()
-added built-in function to the bool type(tointeger, tostring etc...)
-
-***2005-02-27							***
-***version 2.0 release candidate 1(RC 1)***
-added API sq_reseterror()
-modified sq_release()
-now class instances can be cloned
-various bufixes
-
-***2005-01-26        ***
-***version 2.0 beta 1***
-added bool type
-class properties can be redefined in a derived class
-added ops *= /= and %=
-new syntax for class attributes declaration </ and /> instead of ( and )
-increased the max number of literals per function from 65535 to 16777215
-now free variables have proper lexical scoping
-added API sq_createinstance(), sq_pushbool(), sq_getbool()
-added built-in function type()
-added built-in function obj.rawin(key) in table,class and instance
-sq_rawget() and sq_rawset() now work also on classes and instances
-the VM no longer uses C++ exception handling (more suitable for embedded devices)
-various bufixes
-
-***2004-12-21         ***
-***version 2.0 alpha 2***
-globals scoping changed, now if :: is omitted the VM automatically falls back on the root table
-various bufixes
-added class level attributes
-
-***2004-12-12         ***
-***version 2.0 alpha 1***
-codebase branch from version 1.x
-added classes
-added functions with variable number of parameters(vargc & vargv and the ...)
-0 and 0.0 are now considered 'false' by all conditional statements(if,while,for,?,do-while)
-added new api functions sq_newclass() sq_setinstanceup() sq_getinstanceup() sq_getattributes() sq_setattributes()
-modified api sq_settypetag()
-
-***2004-11-01        ***
-***version 1.0 stable***
-fixed some minor bug
-improoved operator 'delete' performances
-added scientific notation for float numbers( eg. 2.e16 or 2.e-2)
-
-***2004-08-30        ***
-***version 1.0 release candidate 2(RC 2)***
-fixed bug in the vm(thx Pierre Renaux)
-fixed bug in the optimizer(thx Pierre Renaux)
-fixed some bug in the documentation(thx JD)
-added new api functions for raw object handling
-removed nested multiline comments
-reduced memory footprint in C references
-
-***2004-08-23        ***
-***version 1.0 release candidate 1(RC 1)***
-fixed division by zero
-the 'in' operator and obj.rawget() do not query the default delegate anymore
-added function sq_getprintfunc()
-added new standard library 'auxlib'(implements default error handlers)
-
-***2004-07-12        ***
-***version 1.0 beta 4***
-fixed a bug in the integer.tochar() built-in method
-fixed unary minus operator
-fixed bug in dofile()
-fixed inconsistency between != and == operators(on float/integer comparison)
-added javascript style unsigned right shift operator '>>>'
-added array(size) constructor built-in function
-array.resize(size,[fill]) built-in function accepts an optional 'fill' value
-improved debug API, added sq_getclosureinfo() and sq_setnativeclosurename()
-
-***2004-05-23        ***
-***version 1.0 beta 3***
-minor vm bug fixes
-string allocation is now faster
-tables and array memory usage is now less conservative(they shrink)
-added regular expression routines in the standard library
-The 'c' expression now accepts only 1 character(thx irbrian)
-multiline strings <[ ]> have been substituted with C# style verbatim strings (eg. @"string")
-added new keyword 'parent' for accessing the delegate of tables and unserdata
-The metamethod '_clone' has been renamed '_cloned'
-the _delslot metamethod's behaviour and prototype have been changed
-new default function in the integer and float object 'tochar()'
-the built-in function chcode2string has been removed
-the default method [table].getdelegate() has been removed
-new api sq_rawdeleteslot()
-new table built-in method rawdelete(key)
-the dynamic mudule loading has been removed from the standard distribution
-some optimizations in the VM
-
-***2004-04-21        ***
-***version 1.0 beta 2***
-minor compiler/parser bug fixes
-sq_newclosure has a different prototype, the "paramscheck" of paramter has been moved to the new function sq_setparamscheck()
-sq_setparamscheck allows to add automatic parameters type checking in native closures
-sq_compile() lost the lineinfo parameter
-new api sq_enabledebuginfo() globally sets compiler's debug info generation
-added consistency check on bytecode serialization
-fixed += operator, now works on strings like +
-added global slot in the base lib _charsize_ to recognize unicode builds from ascii builds runtime
-added registry table
-new api call sq_pushregistrytable()
-added type tag to the userdata type sq_settypetag()
-sq_getuserdata now queries the userdata typetag
-the built in function collect_garbage() as been renamed collectgarbage() for consistency reasons
-new standard libraries(sqlibs are now obsolete)
-
-***2004-02-20	     ***
-***version 1.0 beta 1***
-fixed a bug in the compiler (thanks Martin Kofler)
-fixed bug in the switch case statement
-fixed the _unm metamethod
-fixed minor bugs in the API
-fixed automatic stack resizing
-first beta version
-	first pass code clean up in the VM and base lib
-	first pass code coverege test has been done on VM and built-in lib
-new VM creation API sq_open() sq_close() (sq_newvm and sq_releasevm are now obsolete)
-new api allows to specifiy a "print" function to output text(sq_printfunc)
-added some small optimizations
-new cooperative multi-threading capabilities in the base library(coroutines), VMs are now a built in type("thread")
-new built in functions have been added for manipulating the new "thread" type
-friend virtual machines share the same root table, error handler and debug hook by default
-new compile time options
-
-***2004-01-19       ***
-***version 0.9 alpha***
-fixed a garbage collection bug
-fixed some API bugs(thanks to Joshua Jensen)
-fixed tail calls (in the version 0.8 the tail call optimization was erroneously disabled)
-new function parameters semantic, now passing a wrong number of parameters generates an exception
-native closures have now a built in parameter number checking
-sq_rawget and sq_rawset now work also on arrays
-sq_getsize now woks also on userdata
-the userdata release hook prototype is changed(now passes the size of the userdata)
-the lexer reader function now returns an integer instead of a char that allows better error checking on the input(thx Joshua Jensen)
-faster compiler
-try/catch blocks do not cause any runtime memory allocation anymore
-
-***2003-12-06       ***
-***version 0.8 alpha***
-fixed a bug that was preventing to have callable userdata throught the metamethod _call
-fixed a garbage collection bug
-fixed == operator now can compare correctly different types
-new built in method getstackinfos(level)
-improoved line informations precision for the debug hook
-new api call sq_compilebuffer()
-new built-in api function compilestring()
-new syntactic sugar for function declarations inside tables
-the debug API has been finalized
-
-***2003-11-17       ***
-***version 0.7 alpha***
-fixed critical bug SQInteger the tail call system
-fixed bug in the continue statement code generation
-fixed func call param issue(thanks to Rewoonenco Andrew)
-added _delslot metamethod(thanks to Rewoonenco Andrew)
-new multiline string expression ( delimited by <[ and ]> )
-normal strings ("") do not allow embedded new line anymore
-reduced vm memory footprint(C refs are shared between friend VMs)
-new api method sq_deleteslot()
-new debug hook event 'r' is triggered when a function returns
-
-***2003-11-04       ***
-***version 0.6 alpha***
-fixed switch statement(was executing the default case after a break)
-sq_call() doesn't pop the closure (just the params)
-the vm execution can be suspended from the C API anytime (micro-threads)
-new api calls sq_suspendvm() sq_wakeupvm() sq_getvmstate() and sq_reservestack()
-
-***2003-10-13       ***
-***version 0.5 alpha***
-fixed some minor bug
-tested with non ASCII identifiers in unicode mode(I've tried chinese chars)
-added built-in function string.find()
-the built-in function array.sort() optionally accepts a cmp(a,b) function
-the debug hook function now has a new prototype debug_hook(event_type,sourcefile,line,functionname)
-fixed some debug info imprecision
-
-***2003-10-01       ***
-***version 0.4 alpha***
-faster VM
-sq_call will pop arguments and closure also in case of failure
-fixed a bug in sq_remove
-now the VM detects delegation cycles(and throws an exception)
-new operators ++ and --
-new operator ',' comma operator
-fixed some expression precedence issue
-fixed bug in sq_arraypop
-
-***2003-09-15       ***
-***version 0.3 alpha***
-fixed a bug in array::insert()
-optional Unicode core(define SQUNICODE or _UNICODE on Win32)
-sq_compiler uses a new reader function SQLEXREADFUNC
-the debug hook passes 'l' instead of 'line' for line callbacks
-	and 'c' instead of 'call' for call callbacks
-new array.extend() bulit-in function
-new API sq_clone()
-
-***2003-09-10           ***
-***version 0.2 pre-alpha***
-new completely reentrant VM (sq_open and sq_close are now obsolete)
-sq_newvm() has a new prototype
-allocators are now global and linked in the VM
-_newslot meta method added
-rawset creates a slot if doesn't exists
-the compiler error callback pass the vm handle(thanks Pierre Renaux)
-sq_setforeignptr() sq_getforeingptr() are now public
-sq_resume() now is possible to resume generators from C
-sq_getlasterror() retrieve the last thrown error
-improved docs
-
-***2003-09-06           ***
-***version 0.1 pre-alpha***
-first release
@@ -1,23 +0,0 @@
-
-SQUIRREL=.
-MAKE=make
-
-sq32:
-	cd squirrel; $(MAKE)
-	cd sqstdlib; $(MAKE)
-	cd sq; $(MAKE)
-
-sqprof:
-	cd squirrel; $(MAKE) sqprof
-	cd sqstdlib; $(MAKE) sqprof
-	cd sq; $(MAKE) sqprof
-
-sq64:
-	cd squirrel; $(MAKE) sq64
-	cd sqstdlib; $(MAKE) sq64
-	cd sq; $(MAKE) sq64
-
-clean:
-	$(MAKE) -C squirrel clean
-	$(MAKE) -C sqstdlib clean
-	$(MAKE) -C sq clean
@@ -1,22 +0,0 @@
-The programming language SQUIRREL 2.2.1 stable
-
--------------------------------------------------
-The project has been compiled and run on Windows(Windows XP/2000 on Intel x86 Windows XP Pro on AMD x64) and
-Linux(Slackware 9.0 on Intel x86, Fedora Core 4 on AMD x64).
-
-Has been tested with the following compilers:
-	MS Visual C++ 6.0,7.0,7.1 and 8.0 (32 and 64bits)
-	MinGW gcc 3.2 (mingw special 20020817-1)
-	Cygnus gcc 3.2
-	Linux gcc 3.2.3
-	Linux gcc 4.0.0 (x86 64bits)
-
-
-Feedback and suggestions are appreciated
-project page - http://www.squirrel-lang.org
-community forums - http://www.squirrel-lang.org/Forums
-wiki - http://wiki.squirrel-lang.org
-author - alberto@demichelis.net
-
-END OF README
-
@@ -1,4 +0,0 @@
-This folder contains a modified version of Squirrel that is tailored to meet
-the needs of OpenTTD.
-We have based this modification on the version as described in:
-include/squirrel.h
@@ -1,63 +0,0 @@
-#include <stdarg.h>
-#include <stdio.h>
-
-#include <squirrel.h>
-#include <sqstdio.h>
-#include <sqstdaux.h>
-
-#ifdef _MSC_VER
-#pragma comment (lib ,"squirrel.lib")
-#pragma comment (lib ,"sqstdlib.lib")
-#endif
-
-#ifdef SQUNICODE
-#define scvprintf vwprintf
-#else
-#define scvprintf vprintf
-#endif
-
-void printfunc(HSQUIRRELVM v, const SQChar *s, ...)
-{
-va_list arglist;
-va_start(arglist, s);
-scvprintf(s, arglist);
-va_end(arglist);
-}
-
-void call_foo(HSQUIRRELVM v, int n,float f,const SQChar *s)
-{
-	SQInteger top = sq_gettop(v); //saves the stack size before the call
-	sq_pushroottable(v); //pushes the global table
-	sq_pushstring(v,_SC("foo"),-1);
-	if(SQ_SUCCEEDED(sq_get(v,-2))) { //gets the field 'foo' from the global table
-		sq_pushroottable(v); //push the 'this' (in this case is the global table)
-		sq_pushinteger(v,n);
-		sq_pushfloat(v,f);
-		sq_pushstring(v,s,-1);
-		sq_call(v,4,SQFalse,SQTrue); //calls the function
-	}
-	sq_settop(v,top); //restores the original stack size
-}
-
-int main(int argc, char* argv[])
-{
-	HSQUIRRELVM v;
-	v = sq_open(1024); // creates a VM with initial stack size 1024
-
-	//sq_pushroottable(v); //push the root table were to register the lib function
-	//sqstd_register_iolib(v);
-	sqstd_seterrorhandlers(v); //registers the default error handlers
-
-	sq_setprintfunc(v, printfunc); //sets the print function
-
-	sq_pushroottable(v); //push the root table(were the globals of the script will be stored)
-	if(SQ_SUCCEEDED(sqstd_dofile(v, _SC("test.nut"), SQFalse, SQTrue))) // also prints syntax errors if any
-	{
-		call_foo(v,1,2.5,_SC("teststring"));
-	}
-
-	sq_pop(v,1); //pops the root table
-	sq_close(v);
-
-	return 0;
-}
@@ -1,4 +0,0 @@
-function foo(i, f, s)
-{
-    print("Called foo(), i="+i+", f="+f+", s='"+s+"'\n");
-}
@@ -1,16 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQSTD_AUXLIB_H_
-#define _SQSTD_AUXLIB_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-SQUIRREL_API void sqstd_seterrorhandlers(HSQUIRRELVM v);
-SQUIRREL_API void sqstd_printcallstack(HSQUIRRELVM v);
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /* _SQSTD_AUXLIB_H_ */
@@ -1,20 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQSTDBLOB_H_
-#define _SQSTDBLOB_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-SQUIRREL_API SQUserPointer sqstd_createblob(HSQUIRRELVM v, SQInteger size);
-SQUIRREL_API SQRESULT sqstd_getblob(HSQUIRRELVM v,SQInteger idx,SQUserPointer *ptr);
-SQUIRREL_API SQInteger sqstd_getblobsize(HSQUIRRELVM v,SQInteger idx);
-
-SQUIRREL_API SQRESULT sqstd_register_bloblib(HSQUIRRELVM v);
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*_SQSTDBLOB_H_*/
-
@@ -1,54 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQSTDIO_H_
-#define _SQSTDIO_H_
-
-#ifdef __cplusplus
-
-#define SQSTD_STREAM_TYPE_TAG 0x80000000
-
-struct SQStream {
-	virtual ~SQStream() {}
-	virtual SQInteger Read(void *buffer, SQInteger size) = 0;
-	virtual SQInteger Write(void *buffer, SQInteger size) = 0;
-	virtual SQInteger Flush() = 0;
-	virtual SQInteger Tell() = 0;
-	virtual SQInteger Len() = 0;
-	virtual SQInteger Seek(SQInteger offset, SQInteger origin) = 0;
-	virtual bool IsValid() = 0;
-	virtual bool EOS() = 0;
-};
-
-extern "C" {
-#endif
-
-#define SQ_SEEK_CUR 0
-#define SQ_SEEK_END 1
-#define SQ_SEEK_SET 2
-
-typedef void* SQFILE;
-
-SQUIRREL_API SQFILE sqstd_fopen(const SQChar *,const SQChar *);
-SQUIRREL_API SQInteger sqstd_fread(SQUserPointer, SQInteger, SQInteger, SQFILE);
-SQUIRREL_API SQInteger sqstd_fwrite(const SQUserPointer, SQInteger, SQInteger, SQFILE);
-SQUIRREL_API SQInteger sqstd_fseek(SQFILE , SQInteger , SQInteger);
-SQUIRREL_API SQInteger sqstd_ftell(SQFILE);
-SQUIRREL_API SQInteger sqstd_fflush(SQFILE);
-SQUIRREL_API SQInteger sqstd_fclose(SQFILE);
-SQUIRREL_API SQInteger sqstd_feof(SQFILE);
-
-SQUIRREL_API SQRESULT sqstd_createfile(HSQUIRRELVM v, SQFILE file,SQBool own);
-SQUIRREL_API SQRESULT sqstd_getfile(HSQUIRRELVM v, SQInteger idx, SQFILE *file);
-
-//compiler helpers
-SQUIRREL_API SQRESULT sqstd_loadfile(HSQUIRRELVM v,const SQChar *filename,SQBool printerror);
-SQUIRREL_API SQRESULT sqstd_dofile(HSQUIRRELVM v,const SQChar *filename,SQBool retval,SQBool printerror);
-SQUIRREL_API SQRESULT sqstd_writeclosuretofile(HSQUIRRELVM v,const SQChar *filename);
-
-SQUIRREL_API SQRESULT sqstd_register_iolib(HSQUIRRELVM v);
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*_SQSTDIO_H_*/
-
@@ -1,15 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQSTD_MATH_H_
-#define _SQSTD_MATH_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-SQUIRREL_API SQRESULT sqstd_register_mathlib(HSQUIRRELVM v);
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*_SQSTD_MATH_H_*/
@@ -1,31 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQSTD_STRING_H_
-#define _SQSTD_STRING_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef unsigned int SQRexBool;
-typedef struct SQRex SQRex;
-
-typedef struct {
-	const SQChar *begin;
-	SQInteger len;
-} SQRexMatch;
-
-SQUIRREL_API SQRex *sqstd_rex_compile(const SQChar *pattern,const SQChar **error);
-SQUIRREL_API void sqstd_rex_free(SQRex *exp);
-SQUIRREL_API SQBool sqstd_rex_match(SQRex* exp,const SQChar* text);
-SQUIRREL_API SQBool sqstd_rex_search(SQRex* exp,const SQChar* text, const SQChar** out_begin, const SQChar** out_end);
-SQUIRREL_API SQBool sqstd_rex_searchrange(SQRex* exp,const SQChar* text_begin,const SQChar* text_end,const SQChar** out_begin, const SQChar** out_end);
-SQUIRREL_API SQInteger sqstd_rex_getsubexpcount(SQRex* exp);
-SQUIRREL_API SQBool sqstd_rex_getsubexp(SQRex* exp, SQInteger n, SQRexMatch *subexp);
-
-SQUIRREL_API SQRESULT sqstd_register_stringlib(HSQUIRRELVM v);
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*_SQSTD_STRING_H_*/
@@ -1,15 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQSTD_SYSTEMLIB_H_
-#define _SQSTD_SYSTEMLIB_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-SQUIRREL_API SQInteger sqstd_register_systemlib(HSQUIRRELVM v);
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /* _SQSTD_SYSTEMLIB_H_ */
@@ -1,452 +0,0 @@
-/*
-Copyright (c) 2003-2008 Alberto Demichelis
-
-This software is provided 'as-is', without any
-express or implied warranty. In no event will the
-authors be held liable for any damages arising from
-the use of this software.
-
-Permission is granted to anyone to use this software
-for any purpose, including commercial applications,
-and to alter it and redistribute it freely, subject
-to the following restrictions:
-
-		1. The origin of this software must not be
-		misrepresented; you must not claim that
-		you wrote the original software. If you
-		use this software in a product, an
-		acknowledgment in the product
-		documentation would be appreciated but is
-		not required.
-
-		2. Altered source versions must be plainly
-		marked as such, and must not be
-		misrepresented as being the original
-		software.
-
-		3. This notice may not be removed or
-		altered from any source distribution.
-
-*/
-#ifndef _SQUIRREL_H_
-#define _SQUIRREL_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER >= 1400 // MSVC 2005 safety checks
-# pragma warning(disable: 4996)   // '_wfopen' was declared deprecated
-# define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions
-# define _CRT_NON_CONFORMING_SWPRINTFS // another deprecated stuff
-#endif /* _MSC_VER >= 1400 */
-
-#ifndef SQUIRREL_API
-#define SQUIRREL_API extern
-#endif
-
-#if (defined(_WIN64) || defined(_LP64)) && !defined(_SQ64)
-#define _SQ64
-#endif
-
-#ifdef _SQ64
-#ifdef _MSC_VER
-typedef __int64 SQInteger;
-typedef unsigned __int64 SQUnsignedInteger;
-typedef unsigned __int64 SQHash; /*should be the same size of a pointer*/
-#else
-typedef long SQInteger;
-typedef unsigned long SQUnsignedInteger;
-typedef unsigned long SQHash; /*should be the same size of a pointer*/
-#endif
-typedef int SQInt32;
-#else
-typedef int SQInteger;
-typedef int SQInt32; /*must be 32 bits(also on 64bits processors)*/
-typedef unsigned int SQUnsignedInteger;
-typedef unsigned int SQHash; /*should be the same size of a pointer*/
-#endif
-
-
-typedef float SQFloat;
-typedef void* SQUserPointer;
-typedef SQUnsignedInteger SQBool;
-typedef SQInteger SQRESULT;
-
-#define SQTrue	(1)
-#define SQFalse	(0)
-
-struct SQVM;
-struct SQTable;
-struct SQArray;
-struct SQString;
-struct SQClosure;
-struct SQGenerator;
-struct SQNativeClosure;
-struct SQUserData;
-struct SQFunctionProto;
-struct SQRefCounted;
-struct SQClass;
-struct SQInstance;
-struct SQDelegable;
-
-#ifdef _UNICODE
-#define SQUNICODE
-#endif
-
-#ifdef SQUNICODE
-#if (defined(_MSC_VER) && _MSC_VER >= 1400) // 1400 = VS8
-
-#ifndef _WCHAR_T_DEFINED //this is if the compiler considers wchar_t as native type
-typedef unsigned short wchar_t;
-#endif
-#endif
-
-typedef wchar_t SQChar;
-#define _SC(a) L##a
-#define	scstrcmp	wcscmp
-#define scsprintf	swprintf
-#define scsnprintf	_snwprintf
-#define scstrlen	wcslen
-#define scstrtod	wcstod
-#define scstrtol	wcstol
-#define scatoi		_wtoi
-#define scstrtoul	wcstoul
-#define scvsprintf	vswprintf
-#define scstrstr	wcsstr
-#define scisspace	iswspace
-#define scisdigit	iswdigit
-#define scisxdigit	iswxdigit
-#define scisalpha	iswalpha
-#define sciscntrl	iswcntrl
-#define scisalnum	iswalnum
-#define scprintf	wprintf
-#define scfprintf	fwprintf
-#define scvprintf	vwprintf
-#define scvfprintf	vfwprintf
-#define scvsnprintf	_vsnwprintf
-#define scstrdup	_wcsdup
-#define scstrrchr	wcsrchr
-#define scstrcat	wcscat
-#define MAX_CHAR 0xFFFF
-#else
-typedef char SQChar;
-#define _SC(a) a
-#define	scstrcmp	strcmp
-#define scsprintf	sprintf
-#define scsnprintf	snprintf
-#define scstrlen	strlen
-#define scstrtod	strtod
-#define scstrtol	strtol
-#define scatoi		atoi
-#define scstrtoul	strtoul
-#define scvsprintf	vsprintf
-#define scstrstr	strstr
-#define scisspace	isspace
-#define scisdigit	isdigit
-#define scisxdigit	isxdigit
-#define sciscntrl	iscntrl
-#define scisalpha	isalpha
-#define scisalnum	isalnum
-#define scprintf	printf
-#define scfprintf	fprintf
-#define scvprintf	vprintf
-#define scvfprintf	vfprintf
-#define scvsnprintf	vsnprintf
-#define scstrdup	strdup
-#define scstrrchr	strrchr
-#define scstrcat	strcat
-#define MAX_CHAR 0xFF
-#endif
-
-#define SQUIRREL_VERSION	_SC("Squirrel 2.2.2 stable - With custom OpenTTD modifications")
-#define SQUIRREL_COPYRIGHT	_SC("Copyright (C) 2003-2008 Alberto Demichelis")
-#define SQUIRREL_AUTHOR		_SC("Alberto Demichelis")
-
-#define SQ_VMSTATE_IDLE			0
-#define SQ_VMSTATE_RUNNING		1
-#define SQ_VMSTATE_SUSPENDED	2
-
-#define SQUIRREL_EOB 0
-#define SQ_BYTECODE_STREAM_TAG	0xFAFA
-
-#define SQOBJECT_REF_COUNTED	0x08000000
-#define SQOBJECT_NUMERIC		0x04000000
-#define SQOBJECT_DELEGABLE		0x02000000
-#define SQOBJECT_CANBEFALSE		0x01000000
-
-#define SQ_MATCHTYPEMASKSTRING (-99999)
-
-#define _RT_MASK 0x00FFFFFF
-#define _RAW_TYPE(type) (type&_RT_MASK)
-
-#define _RT_NULL			0x00000001
-#define _RT_INTEGER			0x00000002
-#define _RT_FLOAT			0x00000004
-#define _RT_BOOL			0x00000008
-#define _RT_STRING			0x00000010
-#define _RT_TABLE			0x00000020
-#define _RT_ARRAY			0x00000040
-#define _RT_USERDATA		0x00000080
-#define _RT_CLOSURE			0x00000100
-#define _RT_NATIVECLOSURE	0x00000200
-#define _RT_GENERATOR		0x00000400
-#define _RT_USERPOINTER		0x00000800
-#define _RT_THREAD			0x00001000
-#define _RT_FUNCPROTO		0x00002000
-#define _RT_CLASS			0x00004000
-#define _RT_INSTANCE		0x00008000
-#define _RT_WEAKREF			0x00010000
-
-typedef enum tagSQObjectType{
-	OT_NULL =			(_RT_NULL|SQOBJECT_CANBEFALSE),
-	OT_INTEGER =		(_RT_INTEGER|SQOBJECT_NUMERIC|SQOBJECT_CANBEFALSE),
-	OT_FLOAT =			(_RT_FLOAT|SQOBJECT_NUMERIC|SQOBJECT_CANBEFALSE),
-	OT_BOOL =			(_RT_BOOL|SQOBJECT_CANBEFALSE),
-	OT_STRING =			(_RT_STRING|SQOBJECT_REF_COUNTED),
-	OT_TABLE =			(_RT_TABLE|SQOBJECT_REF_COUNTED|SQOBJECT_DELEGABLE),
-	OT_ARRAY =			(_RT_ARRAY|SQOBJECT_REF_COUNTED),
-	OT_USERDATA =		(_RT_USERDATA|SQOBJECT_REF_COUNTED|SQOBJECT_DELEGABLE),
-	OT_CLOSURE =		(_RT_CLOSURE|SQOBJECT_REF_COUNTED),
-	OT_NATIVECLOSURE =	(_RT_NATIVECLOSURE|SQOBJECT_REF_COUNTED),
-	OT_GENERATOR =		(_RT_GENERATOR|SQOBJECT_REF_COUNTED),
-	OT_USERPOINTER =	_RT_USERPOINTER,
-	OT_THREAD =			(_RT_THREAD|SQOBJECT_REF_COUNTED) ,
-	OT_FUNCPROTO =		(_RT_FUNCPROTO|SQOBJECT_REF_COUNTED), //internal usage only
-	OT_CLASS =			(_RT_CLASS|SQOBJECT_REF_COUNTED),
-	OT_INSTANCE =		(_RT_INSTANCE|SQOBJECT_REF_COUNTED|SQOBJECT_DELEGABLE),
-	OT_WEAKREF =		(_RT_WEAKREF|SQOBJECT_REF_COUNTED)
-}SQObjectType;
-
-#define ISREFCOUNTED(t) (t&SQOBJECT_REF_COUNTED)
-
-
-typedef union tagSQObjectValue
-{
-	struct SQTable *pTable;
-	struct SQArray *pArray;
-	struct SQClosure *pClosure;
-	struct SQGenerator *pGenerator;
-	struct SQNativeClosure *pNativeClosure;
-	struct SQString *pString;
-	struct SQUserData *pUserData;
-	SQInteger nInteger;
-	SQFloat fFloat;
-	SQUserPointer pUserPointer;
-	struct SQFunctionProto *pFunctionProto;
-	struct SQRefCounted *pRefCounted;
-	struct SQDelegable *pDelegable;
-	struct SQVM *pThread;
-	struct SQClass *pClass;
-	struct SQInstance *pInstance;
-	struct SQWeakRef *pWeakRef;
-}SQObjectValue;
-
-
-typedef struct tagSQObject
-{
-	SQObjectType _type;
-	SQObjectValue _unVal;
-}SQObject;
-
-typedef struct tagSQStackInfos{
-	const SQChar* funcname;
-	const SQChar* source;
-	SQInteger line;
-}SQStackInfos;
-
-typedef struct SQVM* HSQUIRRELVM;
-typedef SQObject HSQOBJECT;
-typedef SQInteger (*SQFUNCTION)(HSQUIRRELVM);
-typedef SQInteger (*SQRELEASEHOOK)(SQUserPointer,SQInteger size);
-typedef void (*SQCOMPILERERROR)(HSQUIRRELVM,const SQChar * /*desc*/,const SQChar * /*source*/,SQInteger /*line*/,SQInteger /*column*/);
-typedef void (*SQPRINTFUNCTION)(HSQUIRRELVM,const SQChar * ,...);
-
-typedef SQInteger (*SQWRITEFUNC)(SQUserPointer,SQUserPointer,SQInteger);
-typedef SQInteger (*SQREADFUNC)(SQUserPointer,SQUserPointer,SQInteger);
-
-typedef SQInteger (*SQLEXREADFUNC)(SQUserPointer);
-
-typedef struct tagSQRegFunction{
-	const SQChar *name;
-	SQFUNCTION f;
-	SQInteger nparamscheck;
-	const SQChar *typemask;
-}SQRegFunction;
-
-/*vm*/
-SQUIRREL_API bool sq_can_suspend(HSQUIRRELVM v);
-SQUIRREL_API HSQUIRRELVM sq_open(SQInteger initialstacksize);
-SQUIRREL_API HSQUIRRELVM sq_newthread(HSQUIRRELVM friendvm, SQInteger initialstacksize);
-SQUIRREL_API void sq_seterrorhandler(HSQUIRRELVM v);
-SQUIRREL_API void sq_close(HSQUIRRELVM v);
-SQUIRREL_API void sq_setforeignptr(HSQUIRRELVM v,SQUserPointer p);
-SQUIRREL_API SQUserPointer sq_getforeignptr(HSQUIRRELVM v);
-SQUIRREL_API void sq_setprintfunc(HSQUIRRELVM v, SQPRINTFUNCTION printfunc);
-SQUIRREL_API SQPRINTFUNCTION sq_getprintfunc(HSQUIRRELVM v);
-SQUIRREL_API SQRESULT sq_suspendvm(HSQUIRRELVM v);
-SQUIRREL_API bool sq_resumecatch(HSQUIRRELVM v, int suspend = -1);
-SQUIRREL_API bool sq_resumeerror(HSQUIRRELVM v);
-SQUIRREL_API SQRESULT sq_wakeupvm(HSQUIRRELVM v,SQBool resumedret,SQBool retval,SQBool raiseerror);
-SQUIRREL_API SQInteger sq_getvmstate(HSQUIRRELVM v);
-
-/*compiler*/
-SQUIRREL_API SQRESULT sq_compile(HSQUIRRELVM v,SQLEXREADFUNC read,SQUserPointer p,const SQChar *sourcename,SQBool raiseerror);
-SQUIRREL_API SQRESULT sq_compilebuffer(HSQUIRRELVM v,const SQChar *s,SQInteger size,const SQChar *sourcename,SQBool raiseerror);
-SQUIRREL_API void sq_enabledebuginfo(HSQUIRRELVM v, SQBool enable);
-SQUIRREL_API void sq_notifyallexceptions(HSQUIRRELVM v, SQBool enable);
-SQUIRREL_API void sq_setcompilererrorhandler(HSQUIRRELVM v,SQCOMPILERERROR f);
-
-/*stack operations*/
-SQUIRREL_API void sq_push(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API void sq_pop(HSQUIRRELVM v,SQInteger nelemstopop);
-SQUIRREL_API void sq_poptop(HSQUIRRELVM v);
-SQUIRREL_API void sq_remove(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQInteger sq_gettop(HSQUIRRELVM v);
-SQUIRREL_API void sq_settop(HSQUIRRELVM v,SQInteger newtop);
-SQUIRREL_API void sq_reservestack(HSQUIRRELVM v,SQInteger nsize);
-SQUIRREL_API SQInteger sq_cmp(HSQUIRRELVM v);
-SQUIRREL_API void sq_move(HSQUIRRELVM dest,HSQUIRRELVM src,SQInteger idx);
-
-/*object creation handling*/
-SQUIRREL_API SQUserPointer sq_newuserdata(HSQUIRRELVM v,SQUnsignedInteger size);
-SQUIRREL_API void sq_newtable(HSQUIRRELVM v);
-SQUIRREL_API void sq_newarray(HSQUIRRELVM v,SQInteger size);
-SQUIRREL_API void sq_newclosure(HSQUIRRELVM v,SQFUNCTION func,SQUnsignedInteger nfreevars);
-SQUIRREL_API SQRESULT sq_setparamscheck(HSQUIRRELVM v,SQInteger nparamscheck,const SQChar *typemask);
-SQUIRREL_API SQRESULT sq_bindenv(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API void sq_pushstring(HSQUIRRELVM v,const SQChar *s,SQInteger len);
-SQUIRREL_API void sq_pushfloat(HSQUIRRELVM v,SQFloat f);
-SQUIRREL_API void sq_pushinteger(HSQUIRRELVM v,SQInteger n);
-SQUIRREL_API void sq_pushbool(HSQUIRRELVM v,SQBool b);
-SQUIRREL_API void sq_pushuserpointer(HSQUIRRELVM v,SQUserPointer p);
-SQUIRREL_API void sq_pushnull(HSQUIRRELVM v);
-SQUIRREL_API SQObjectType sq_gettype(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQInteger sq_getsize(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_getbase(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQBool sq_instanceof(HSQUIRRELVM v);
-SQUIRREL_API void sq_tostring(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API void sq_tobool(HSQUIRRELVM v, SQInteger idx, SQBool *b);
-SQUIRREL_API SQRESULT sq_getstring(HSQUIRRELVM v,SQInteger idx,const SQChar **c);
-SQUIRREL_API SQRESULT sq_getinteger(HSQUIRRELVM v,SQInteger idx,SQInteger *i);
-SQUIRREL_API SQRESULT sq_getfloat(HSQUIRRELVM v,SQInteger idx,SQFloat *f);
-SQUIRREL_API SQRESULT sq_getbool(HSQUIRRELVM v,SQInteger idx,SQBool *b);
-SQUIRREL_API SQRESULT sq_getthread(HSQUIRRELVM v,SQInteger idx,HSQUIRRELVM *thread);
-SQUIRREL_API SQRESULT sq_getuserpointer(HSQUIRRELVM v,SQInteger idx,SQUserPointer *p);
-SQUIRREL_API SQRESULT sq_getuserdata(HSQUIRRELVM v,SQInteger idx,SQUserPointer *p,SQUserPointer *typetag);
-SQUIRREL_API SQRESULT sq_settypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer typetag);
-SQUIRREL_API SQRESULT sq_gettypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer *typetag);
-SQUIRREL_API void sq_setreleasehook(HSQUIRRELVM v,SQInteger idx,SQRELEASEHOOK hook);
-SQUIRREL_API SQChar *sq_getscratchpad(HSQUIRRELVM v,SQInteger minsize);
-SQUIRREL_API SQRESULT sq_getclosureinfo(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger *nparams,SQUnsignedInteger *nfreevars);
-SQUIRREL_API SQRESULT sq_setnativeclosurename(HSQUIRRELVM v,SQInteger idx,const SQChar *name);
-SQUIRREL_API SQRESULT sq_setinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer p);
-SQUIRREL_API SQRESULT sq_getinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p,SQUserPointer typetag);
-SQUIRREL_API SQRESULT sq_setclassudsize(HSQUIRRELVM v, SQInteger idx, SQInteger udsize);
-SQUIRREL_API SQRESULT sq_newclass(HSQUIRRELVM v,SQBool hasbase);
-SQUIRREL_API SQRESULT sq_createinstance(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_setattributes(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_getattributes(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_getclass(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API void sq_weakref(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_getdefaultdelegate(HSQUIRRELVM v,SQObjectType t);
-
-/*object manipulation*/
-SQUIRREL_API void sq_pushroottable(HSQUIRRELVM v);
-SQUIRREL_API void sq_pushregistrytable(HSQUIRRELVM v);
-SQUIRREL_API void sq_pushconsttable(HSQUIRRELVM v);
-SQUIRREL_API SQRESULT sq_setroottable(HSQUIRRELVM v);
-SQUIRREL_API SQRESULT sq_setconsttable(HSQUIRRELVM v);
-SQUIRREL_API SQRESULT sq_newslot(HSQUIRRELVM v, SQInteger idx, SQBool bstatic);
-SQUIRREL_API SQRESULT sq_deleteslot(HSQUIRRELVM v,SQInteger idx,SQBool pushval);
-SQUIRREL_API SQRESULT sq_set(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_get(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_rawget(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_rawset(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_rawdeleteslot(HSQUIRRELVM v,SQInteger idx,SQBool pushval);
-SQUIRREL_API SQRESULT sq_arrayappend(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_arraypop(HSQUIRRELVM v,SQInteger idx,SQBool pushval);
-SQUIRREL_API SQRESULT sq_arrayresize(HSQUIRRELVM v,SQInteger idx,SQInteger newsize);
-SQUIRREL_API SQRESULT sq_arrayreverse(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_arrayremove(HSQUIRRELVM v,SQInteger idx,SQInteger itemidx);
-SQUIRREL_API SQRESULT sq_arrayinsert(HSQUIRRELVM v,SQInteger idx,SQInteger destpos);
-SQUIRREL_API SQRESULT sq_setdelegate(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_getdelegate(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_clone(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_setfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval);
-SQUIRREL_API SQRESULT sq_next(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_getweakrefval(HSQUIRRELVM v,SQInteger idx);
-SQUIRREL_API SQRESULT sq_clear(HSQUIRRELVM v,SQInteger idx);
-
-/*calls*/
-SQUIRREL_API SQRESULT sq_call(HSQUIRRELVM v,SQInteger params,SQBool retval,SQBool raiseerror, int suspend = -1);
-SQUIRREL_API SQRESULT sq_resume(HSQUIRRELVM v,SQBool retval,SQBool raiseerror);
-SQUIRREL_API const SQChar *sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedInteger idx);
-SQUIRREL_API const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval);
-SQUIRREL_API SQRESULT sq_throwerror(HSQUIRRELVM v,const SQChar *err);
-SQUIRREL_API void sq_reseterror(HSQUIRRELVM v);
-SQUIRREL_API void sq_getlasterror(HSQUIRRELVM v);
-
-/*raw object handling*/
-SQUIRREL_API SQRESULT sq_getstackobj(HSQUIRRELVM v,SQInteger idx,HSQOBJECT *po);
-SQUIRREL_API void sq_pushobject(HSQUIRRELVM v,HSQOBJECT obj);
-SQUIRREL_API void sq_addref(HSQUIRRELVM v,HSQOBJECT *po);
-SQUIRREL_API SQBool sq_release(HSQUIRRELVM v,HSQOBJECT *po);
-SQUIRREL_API void sq_resetobject(HSQOBJECT *po);
-SQUIRREL_API const SQChar *sq_objtostring(HSQOBJECT *o);
-SQUIRREL_API SQBool sq_objtobool(HSQOBJECT *o);
-SQUIRREL_API SQInteger sq_objtointeger(HSQOBJECT *o);
-SQUIRREL_API SQFloat sq_objtofloat(HSQOBJECT *o);
-SQUIRREL_API SQRESULT sq_getobjtypetag(HSQOBJECT *o,SQUserPointer * typetag);
-
-/*GC*/
-SQUIRREL_API SQInteger sq_collectgarbage(HSQUIRRELVM v);
-
-/*serialization*/
-SQUIRREL_API SQRESULT sq_writeclosure(HSQUIRRELVM vm,SQWRITEFUNC writef,SQUserPointer up);
-SQUIRREL_API SQRESULT sq_readclosure(HSQUIRRELVM vm,SQREADFUNC readf,SQUserPointer up);
-
-/*mem allocation*/
-SQUIRREL_API void *sq_malloc(SQUnsignedInteger size);
-SQUIRREL_API void *sq_realloc(void* p,SQUnsignedInteger oldsize,SQUnsignedInteger newsize);
-SQUIRREL_API void sq_free(void *p,SQUnsignedInteger size);
-
-/*debug*/
-SQUIRREL_API SQRESULT sq_stackinfos(HSQUIRRELVM v,SQInteger level,SQStackInfos *si);
-SQUIRREL_API void sq_setdebughook(HSQUIRRELVM v);
-
-/*UTILITY MACRO*/
-#define sq_isnumeric(o) ((o)._type&SQOBJECT_NUMERIC)
-#define sq_istable(o) ((o)._type==OT_TABLE)
-#define sq_isarray(o) ((o)._type==OT_ARRAY)
-#define sq_isfunction(o) ((o)._type==OT_FUNCPROTO)
-#define sq_isclosure(o) ((o)._type==OT_CLOSURE)
-#define sq_isgenerator(o) ((o)._type==OT_GENERATOR)
-#define sq_isnativeclosure(o) ((o)._type==OT_NATIVECLOSURE)
-#define sq_isstring(o) ((o)._type==OT_STRING)
-#define sq_isinteger(o) ((o)._type==OT_INTEGER)
-#define sq_isfloat(o) ((o)._type==OT_FLOAT)
-#define sq_isuserpointer(o) ((o)._type==OT_USERPOINTER)
-#define sq_isuserdata(o) ((o)._type==OT_USERDATA)
-#define sq_isthread(o) ((o)._type==OT_THREAD)
-#define sq_isnull(o) ((o)._type==OT_NULL)
-#define sq_isclass(o) ((o)._type==OT_CLASS)
-#define sq_isinstance(o) ((o)._type==OT_INSTANCE)
-#define sq_isbool(o) ((o)._type==OT_BOOL)
-#define sq_isweakref(o) ((o)._type==OT_WEAKREF)
-#define sq_type(o) ((o)._type)
-
-/* deprecated */
-#define sq_createslot(v,n) sq_newslot(v,n,SQFalse)
-
-#define SQ_OK (0)
-#define SQ_ERROR (-1)
-
-#define SQ_FAILED(res) (res<0)
-#define SQ_SUCCEEDED(res) (res>=0)
-
-#ifdef __cplusplus
-} /*extern "C"*/
-#endif
-
-#endif /*_SQUIRREL_H_*/
@@ -1,22 +0,0 @@
-/*
-*
-* Original Javascript version by David Hedbor(http://www.bagley.org/~doug/shootout/)
-*
-*/
-
-function Ack(M, N) {
-    if (M == 0) return( N + 1 );
-    if (N == 0) return( Ack(M - 1, 1) );
-    return( Ack(M - 1, Ack(M, (N - 1))) );
-}
-
-local n;
-
-if(ARGS.len()!=0) {
-   n = ARGS[0].tointeger();
-  if(n < 1) n = 1;
-} else {
-  n = 1;
-}
-print("n="+n+"\n");
-print("Ack(3,"+ n+ "):"+ Ack(3, n));
@@ -1,28 +0,0 @@
-/*
-*
-* Original Javascript version by David Hedbor(http://www.bagley.org/~doug/shootout/)
-*
-*/
-local n, i, k;
-
-if(ARGS.len()!=0) {
-   n = ARGS[0].tointeger();
-  if(n < 1) n = 1;
-} else {
-  n = 1;
-}
-
-local x = []; x.resize(n);
-local y = []; y.resize(n);
-
-for (i = 0; i < n; i+=1) {
-  x[i] = i + 1;
-  y[i] = 0;
-}
-
-for (k = 0 ; k < n; k+=1) {
-  for (i = n-1; i >= 0; i-=1) {
-	y[i] = y[i]+ x[i];
-  }
-}
-print(y[0].tostring()+" "+y[n-1]);
@@ -1,49 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////
-class BaseVector {
-	constructor(...)
-	{
-		if(vargc >= 3) {
-			x = vargv[0];
-			y = vargv[1];
-			z = vargv[2];
-		}
-	}
-
-
-	x = 0;
-	y = 0;
-	z = 0;
-}
-
-class Vector3 extends BaseVector {
-	function _add(other)
-	{
-		if(other instanceof this.getclass())
-			return ::Vector3(x+other.x,y+other.y,z+other.z);
-		else
-			throw "wrong parameter";
-	}
-	function Print()
-	{
-		::print(x+","+y+","+z+"\n");
-	}
-}
-
-local v0 = Vector3(1,2,3)
-local v1 = Vector3(11,12,13)
-local v2 = v0 + v1;
-v2.Print();
-
-FakeNamespace <- {
-	Utils = {}
-}
-
-class FakeNamespace.Utils.SuperClass {
-	constructor()
-	{
-		::print("FakeNamespace.Utils.SuperClass")
-	}
-}
-
-local testy = FakeNamespace.Utils.SuperClass();
@@ -1,35 +0,0 @@
-class Foo {
-	//constructor
-	constructor(a)
-	{
-		testy = ["stuff",1,2,3];
-	}
-	//attributes of PrintTesty
-	</ test = "freakin attribute"/>
-	function PrintTesty()
-	{
-		foreach(i,val in testy)
-		{
-			::print("idx = "+i+" = "+val+" \n");
-		}
-	}
-	//attributes of testy
-	</ flippy = 10 , second = [1,2,3] />
-	testy = null;
-
-}
-
-foreach(member,val in Foo)
-{
-	::print(member+"\n");
-	local attr;
-	if((attr = Foo.getattributes(member)) != null) {
-		foreach(i,v in attr)
-		{
-			::print("\t"+i+" = "+(typeof v)+"\n");
-		}
-	}
-	else {
-		::print("\t<no attributes>\n")
-	}
-}
@@ -1,25 +0,0 @@
-function coroutine_test(a,b)
-{
-	::print(a+" "+b+"\n");
-	local ret = ::suspend("suspend 1");
-	::print("the coroutine says "+ret+"\n");
-	ret = ::suspend("suspend 2");
-	::print("the coroutine says "+ret+"\n");
-	ret = ::suspend("suspend 3");
-	::print("the coroutine says "+ret+"\n");
-	return "I'm done"
-}
-
-local coro = ::newthread(coroutine_test);
-
-local susparam = coro.call("test","coroutine"); //starts the coroutine
-
-local i = 1;
-do
-{
-	::print("suspend passed ["+susparam+"]\n")
-	susparam = coro.wakeup("ciao "+i);
-	++i;
-}while(coro.getstatus()=="suspended")
-
-::print("return passed ["+susparam+"]\n")
@@ -1,52 +0,0 @@
-
-PEntity <- {
-	name="noname"
-	pos={x=0,y=0,z=0}
-	type="entity"
-	//methamethod
-	_typeof=function()
-	{
-		return type;
-	}
-}
-
-function PEntity::PrintPos()
-{
-	::print("x="+pos.x+" y="+pos.y+" z="+pos.z+"\n");
-}
-
-function PEntity::new(name,pos)
-{
-	local newentity=clone ::PEntity;
-	if(name)
-		newentity.name=name;
-	if(pos)
-		newentity.pos=pos;
-	return newentity;
-}
-
-PPlayer <- {
-	model="warrior.mdl"
-	weapon="fist"
-	health=100
-	armor=0
-	//overrides the parent type
-	type="player"
-}
-
-function PPlayer::new(name,pos)
-{
-	local newplayer=delegate ::PEntity.new(name,pos) : clone ::PPlayer;
-	return newplayer;
-}
-
-local player=PPlayer.new("godzilla",{x=10,y=20,z=30});
-
-::print("PLAYER NAME"+player.name+"\n");
-::print("ENTITY TYPE"+typeof player+"\n");
-
-player.PrintPos();
-
-player.pos.x=123;
-
-player.PrintPos();
@@ -1,15 +0,0 @@
-/*
-*
-* Original Javascript version by David Hedbor(http://www.bagley.org/~doug/shootout/)
-*
-*/
-
-function fib(n)
-{
-    if (n < 2) return 1
-    return fib(n-2) + fib(n-1)
-}
-
-local n = ARGS.len()!=0?ARGS[0].tointeger():1
-
-print(fib(n)+"\n")
@@ -1,33 +0,0 @@
-function min(x,y)
-	return x<y?x:y;
-
-function max(x,y)
-	return x>y?x:y;
-
-if(min(100,200)>max(50,20))
-	print("I'm useless statement just to show up the if/else\n");
-else
-	print("squirrel!!\n");
-
-print("\n")
-
-function typy(obj)
-{
-	switch(typeof obj)
-	{
-		case "integer":
-		case "float":
-			return "is a number";
-		case "table":
-		case "array":
-			return "is a container";
-		default:
-			return "is other stuff"
-	}
-}
-
-local a=1,b={},c=function(a,b){return a+b;}
-
-print("a "+typy(a)+"\n");
-print("b "+typy(b)+"\n");
-print("c "+typy(c)+"\n");
@@ -1,42 +0,0 @@
-/*
-*Random number function from The Great Computer Language shootout
-*converted to a generator func
-*/
-
-function gen_random(max) {
-	local last=42
-	local IM = 139968;
-	local IA = 3877;
-	local IC = 29573;
-	for(;;){  //loops forever
-		yield (max * (last = (last * IA + IC) % IM) / IM);
-	}
-}
-
-local randtor=gen_random(100);
-
-print("RAND NUMBERS \n")
-
-for(local i=0;i<10;i+=1)
-	print(">"+resume randtor+"\n");
-
-print("FIBONACCI \n")
-function fiboz(n)
-{
-	local prev=0;
-	local curr=1;
-	yield 1;
-
-	for(local i=0;i<n-1;i+=1)
-	{
-		local res=prev+curr;
-		prev=curr;
-		yield curr=res;
-	}
-	return prev+curr;
-}
-
-foreach(val in fiboz(10))
-{
-	::print(">"+val+"\n");
-}
@@ -1 +0,0 @@
-print("Hello World!")
@@ -1,39 +0,0 @@
-/*translation of the list test from The Great Computer Language Shootout
-*/
-
-function compare_arr(a1,a2)
-{
-	foreach(i,val in a1)
-		if(val!=a2[i])return null;
-	return 1;
-}
-
-function test()
-{
-	local size=10000
-	local l1=[]; l1.resize(size);
-	for(local i=0;i<size;i+=1) l1[i]=i;
-	local l2=clone l1;
-	local l3=[]
-
-	l2.reverse();
-	while(l2.len()>0)
-		l3.append(l2.pop());
-	while(l3.len()>0)
-		l2.append(l3.pop());
-	l1.reverse();
-
-	if(compare_arr(l1,l2))
-		return l1.len();
-	return null;
-}
-
-local n = ARGS.len()!=0?ARGS[0].tointeger():1
-for(local i=0;i<n;i+=1)
-	if(!test())
-	{
-		print("failed");
-		return;
-	}
-
-print("oki doki");
@@ -1,32 +0,0 @@
-local arr=["one","two","three"]
-
-::print("FOREACH\n");
-
-foreach(i,val in arr)
-{
-	::print("index ["+i+"]="+val+"\n");
-}
-
-::print("FOR\n");
-
-for(local i=0;i<arr.len();i+=1)
-{
-	::print("index ["+i+"]="+arr[i]+"\n");
-}
-
-::print("WHILE\n");
-
-local i=0;
-while(i<arr.len())
-{
-	::print("index ["+i+"]="+arr[i]+"\n");
-	i+=1;
-}
-::print("DO WHILE\n");
-
-local i=0;
-do
-{
-	::print("index ["+i+"]="+arr[i]+"\n");
-	i+=1;
-}while(i<arr.len());
@@ -1,44 +0,0 @@
-/*
-*
-* Original Javascript version by David Hedbor(http://www.bagley.org/~doug/shootout/)
-*
-*/
-local SIZE=30;
-
-function mkmatrix(rows, cols) {
-  local i, j, count = 1;
-  local m = []; m.resize(rows);
-  for (i = 0; i < rows; i+=1) {
-    m[i] = [];m[i].resize(cols)
-    for (j = 0; j < cols; j+=1) {
-      m[i][j] = count+=1;
-    }
-  }
-  return m;
-}
-
-function mmult(rows, cols,  m1, m2, m3) {
-  local i, j, k, val;
-  for (i = 0; i < rows; i+=1) {
-    for (j = 0; j < cols; j+=1) {
-      val = 0;
-      for (k = 0; k < cols; k+=1) {
-	val += m1[i][k] * m2[k][j];
-      }
-      m3[i][j] = val;
-    }
-  }
-  return m3;
-}
-
-local n = ARGS.len()!=0?ARGS[0].tointeger():1
-
-local m1 = mkmatrix(SIZE, SIZE);
-local m2 = mkmatrix(SIZE, SIZE);
-local mm = mkmatrix(SIZE, SIZE);
-
-for (local i = 0; i < n; i+=1) {
-  mmult(SIZE, SIZE, m1, m2, mm);
-}
-
-print(mm[0][0]+" "+mm[2][3]+" "+mm[3][2]+" "+mm[4][4]);
@@ -1,115 +0,0 @@
-
-local base_vec={
-	function _add(n)
-	{
-		return {
-			x=x+n.x,
-			y=y+n.y,
-			z=z+n.z,
-		}
-	}
-	function _sub(n)
-	{
-		return {
-			x=x-n.x,
-			y=y-n.y,
-			z=z-n.z,
-		}
-	}
-	function _div(n)
-	{
-		return {
-			x=x/n.x,
-			y=y/n.y,
-			z=z/n.z,
-		}
-	}
-	function _mul(n)
-	{
-		return {
-			x=x*n.x,
-			y=y*n.y,
-			z=z*n.z,
-		}
-	}
-	function _modulo(n)
-	{
-		return {
-			x=x%n,
-			y=y%n,
-			z=z%n,
-		}
-	}
-	function _typeof() {return "vector";}
-	function _get(key)
-	{
-		if(key==100)
-		{
-			return test_field;
-		}
-	},
-	function _set(key,val)
-	{
-		::print("key = "+key+"\n");
-		::print("val = "+val+"\n")
-		if(key==100)
-		{
-			return test_field=val;
-		}
-	}
-	test_field="nothing"
-}
-
-function vector(_x,_y,_z):(base_vec)
-{
-	return delegate base_vec : {x=_x,y=_y,z=_z }
-}
-////////////////////////////////////////////////////////////
-
-local v1=vector(1.5,2.5,3.5);
-local v2=vector(1.5,2.5,3.5);
-
-local r=v1+v2;
-
-
-foreach(i,val in r)
-{
-	print(i+" = "+val+"\n");
-}
-
-r=v1*v2;
-
-foreach(i,val in r)
-{
-	print(i+" = "+val+"\n");
-}
-
-r=v1/v2;
-
-foreach(i,val in r)
-{
-	print(i+" = "+val+"\n");
-}
-
-r=v1-v2;
-
-foreach(i,val in r)
-{
-	print(i+" = "+val+"\n");
-}
-
-r=v1%2;
-
-foreach(i,val in r)
-{
-	print(i+" = "+val+"\n");
-}
-
-print(v1[100]+"\n");
-v1[100]="set SUCCEEDED";
-print(v1[100]+"\n");
-
-if(typeof v1=="vector")
-	print("<SUCCEEDED>\n");
-else
-	print("<FAILED>\n");
@@ -1,61 +0,0 @@
-/*translation of the methcall test from The Great Computer Language Shootout
-*/
-
-Toggle <- {
-	bool=null
-}
-
-function Toggle::value() {
-	return bool;
-}
-
-function Toggle::activate() {
-	bool = !bool;
-	return this;
-}
-
-function Toggle::new(startstate) {
-	local newo=clone this;
-	newo.bool = startstate;
-	return newo;
-}
-
-NthToggle <- {
-	count_max=null
-	count=0
-}
-
-function NthToggle::new(start_state,max_counter)
-{
-	local newo=delegate ::Toggle.new(start_state) : clone this;
-	newo.count_max <- max_counter
-	return newo;
-}
-
-function NthToggle::activate ()
-{
-	count+=1
-    if (count >= count_max) {
-      bool = !bool;
-      count = 0;
-    }
-    return this;
-}
-
-
-local n = ARGS.len()!=0?ARGS[0].tointeger():1
-
-local val = 1;
-local toggle = Toggle.new(val);
-for (local i=0; i<n; i+=1) {
-  val = toggle.activate().value();
-
-}
-print(toggle.value() ? "true\n" : "false\n");
-
-val = 1;
-local ntoggle = NthToggle.new(val, 3);
-for (local i=0; i<n; i+=1) {
-  val = ntoggle.activate().value();
-}
-print(ntoggle.value() ? "true\n" : "false\n");
@@ -1,24 +0,0 @@
-function state1()
-{
-	::suspend("state1");
-	return state2();
-}
-
-function state2()
-{
-	::suspend("state2");
-	return state3();
-}
-
-function state3()
-{
-	::suspend("state3");
-	return state1();
-}
-
-local statethread = ::newthread(state1)
-
-::print(statethread.call()+"\n");
-
-for(local i = 0; i < 10000; i++)
-	::print(statethread.wakeup()+"\n");
@@ -1,24 +0,0 @@
-SQUIRREL= ..
-
-
-OUT= $(SQUIRREL)/bin/sq
-INCZ= -I$(SQUIRREL)/include -I. -I$(SQUIRREL)/sqlibs
-LIBZ= -L$(SQUIRREL)/lib
-LIB= -lsquirrel -lsqstdlib
-
-OBJS= sq.o
-
-SRCS= sq.c
-
-
-sq32:
-	g++ -O2 -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
-
-sqprof:
-	g++ -O2 -pg -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
-
-sq64:
-	g++ -O2 -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
-
-clean:
-	rm -f $(OUT)
@@ -1,321 +0,0 @@
-/*	see copyright notice in squirrel.h */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-
-#if defined(_MSC_VER) && defined(_DEBUG)
-#include <crtdbg.h>
-#include <conio.h>
-#endif
-#include <squirrel.h>
-#include <sqstdblob.h>
-#include <sqstdsystem.h>
-#include <sqstdio.h>
-#include <sqstdmath.h>
-#include <sqstdstring.h>
-#include <sqstdaux.h>
-
-#ifdef SQUNICODE
-#define scfprintf fwprintf
-#define scfopen	_wfopen
-#define scvprintf vwprintf
-#else
-#define scfprintf fprintf
-#define scfopen	fopen
-#define scvprintf vprintf
-#endif
-
-
-void PrintVersionInfos();
-
-#if defined(_MSC_VER) && defined(_DEBUG)
-int MemAllocHook( int allocType, void *userData, size_t size, int blockType,
-   long requestNumber, const unsigned char *filename, int lineNumber)
-{
-//	if(requestNumber==585)_asm int 3;
-	return 1;
-}
-#endif
-
-
-SQInteger quit(HSQUIRRELVM v)
-{
-	int *done;
-	sq_getuserpointer(v,-1,(SQUserPointer*)&done);
-	*done=1;
-	return 0;
-}
-
-void printfunc(HSQUIRRELVM v,const SQChar *s,...)
-{
-	va_list vl;
-	va_start(vl, s);
-	scvprintf( s, vl);
-	va_end(vl);
-}
-
-void PrintVersionInfos()
-{
-	scfprintf(stdout,_SC("%s %s (%d bits)\n"),SQUIRREL_VERSION,SQUIRREL_COPYRIGHT,sizeof(SQInteger)*8);
-}
-
-void PrintUsage()
-{
-	scfprintf(stderr,_SC("usage: sq <options> <scriptpath [args]>.\n")
-		_SC("Available options are:\n")
-		_SC("   -c              compiles the file to bytecode(default output 'out.cnut')\n")
-		_SC("   -o              specifies output file for the -c option\n")
-		_SC("   -c              compiles only\n")
-		_SC("   -d              generates debug infos\n")
-		_SC("   -v              displays version infos\n")
-		_SC("   -h              prints help\n"));
-}
-
-#define _INTERACTIVE 0
-#define _DONE 2
-//<<FIXME>> this func is a mess
-int getargs(HSQUIRRELVM v,int argc, char* argv[])
-{
-	int i;
-	int compiles_only = 0;
-	static SQChar temp[500];
-	const SQChar *ret=NULL;
-	char * output = NULL;
-	int lineinfo=0;
-	if(argc>1)
-	{
-		int arg=1,exitloop=0;
-		while(arg < argc && !exitloop)
-		{
-
-			if(argv[arg][0]=='-')
-			{
-				switch(argv[arg][1])
-				{
-				case 'd': //DEBUG(debug infos)
-					sq_enabledebuginfo(v,1);
-					break;
-				case 'c':
-					compiles_only = 1;
-					break;
-				case 'o':
-					if(arg < argc) {
-						arg++;
-						output = argv[arg];
-					}
-					break;
-				case 'v':
-					PrintVersionInfos();
-					return _DONE;
-
-				case 'h':
-					PrintVersionInfos();
-					PrintUsage();
-					return _DONE;
-				default:
-					PrintVersionInfos();
-					scprintf(_SC("unknown prameter '-%c'\n"),argv[arg][1]);
-					PrintUsage();
-					return _DONE;
-				}
-			}else break;
-			arg++;
-		}
-
-		// src file
-
-		if(arg<argc) {
-			const SQChar *filename=NULL;
-#ifdef SQUNICODE
-			mbstowcs(temp,argv[arg],strlen(argv[arg]));
-			filename=temp;
-#else
-			filename=argv[arg];
-#endif
-
-			arg++;
-			sq_pushroottable(v);
-			sq_pushstring(v,_SC("ARGS"),-1);
-			sq_newarray(v,0);
-			for(i=arg;i<argc;i++)
-			{
-				const SQChar *a;
-#ifdef SQUNICODE
-				int alen=(int)strlen(argv[i]);
-				a=sq_getscratchpad(v,(int)(alen*sizeof(SQChar)));
-				mbstowcs(sq_getscratchpad(v,-1),argv[i],alen);
-				sq_getscratchpad(v,-1)[alen] = _SC('\0');
-#else
-				a=argv[i];
-#endif
-				sq_pushstring(v,a,-1);
-
-				sq_arrayappend(v,-2);
-			}
-			sq_createslot(v,-3);
-			sq_pop(v,1);
-			if(compiles_only) {
-				if(SQ_SUCCEEDED(sqstd_loadfile(v,filename,SQTrue))){
-					SQChar *outfile = _SC("out.cnut");
-					if(output) {
-#ifdef SQUNICODE
-						int len = (int)(strlen(output)+1);
-						mbstowcs(sq_getscratchpad(v,len*sizeof(SQChar)),output,len);
-						outfile = sq_getscratchpad(v,-1);
-#else
-						outfile = output;
-#endif
-					}
-					if(SQ_SUCCEEDED(sqstd_writeclosuretofile(v,outfile)))
-						return _DONE;
-				}
-			}
-			else {
-				if(SQ_SUCCEEDED(sqstd_dofile(v,filename,SQFalse,SQTrue))) {
-					return _DONE;
-				}
-			}
-			//if this point is reached an error occured
-			{
-				const SQChar *err;
-				sq_getlasterror(v);
-				if(SQ_SUCCEEDED(sq_getstring(v,-1,&err))) {
-					scprintf(_SC("Error [%s]\n"),err);
-					return _DONE;
-				}
-			}
-
-		}
-	}
-
-	return _INTERACTIVE;
-}
-
-void Interactive(HSQUIRRELVM v)
-{
-
-#define MAXINPUT 1024
-	SQChar buffer[MAXINPUT];
-	SQInteger blocks =0;
-	SQInteger string=0;
-	SQInteger retval=0;
-	SQInteger done=0;
-	PrintVersionInfos();
-
-	sq_pushroottable(v);
-	sq_pushstring(v,_SC("quit"),-1);
-	sq_pushuserpointer(v,&done);
-	sq_newclosure(v,quit,1);
-	sq_setparamscheck(v,1,NULL);
-	sq_createslot(v,-3);
-	sq_pop(v,1);
-
-    while (!done)
-	{
-		SQInteger i = 0;
-		scprintf(_SC("\nsq>"));
-		for(;;) {
-			int c;
-			if(done)return;
-			c = getchar();
-			if (c == _SC('\n')) {
-				if (i>0 && buffer[i-1] == _SC('\\'))
-				{
-					buffer[i-1] = _SC('\n');
-				}
-				else if(blocks==0)break;
-				buffer[i++] = _SC('\n');
-			}
-			else if (c==_SC('}')) {blocks--; buffer[i++] = (SQChar)c;}
-			else if(c==_SC('{') && !string){
-					blocks++;
-					buffer[i++] = (SQChar)c;
-			}
-			else if(c==_SC('"') || c==_SC('\'')){
-					string=!string;
-					buffer[i++] = (SQChar)c;
-			}
-			else if (i >= MAXINPUT-1) {
-				scfprintf(stderr, _SC("sq : input line too long\n"));
-				break;
-			}
-			else{
-				buffer[i++] = (SQChar)c;
-			}
-		}
-		buffer[i] = _SC('\0');
-
-		if(buffer[0]==_SC('=')){
-			scsprintf(sq_getscratchpad(v,MAXINPUT),_SC("return (%s)"),&buffer[1]);
-			memcpy(buffer,sq_getscratchpad(v,-1),(scstrlen(sq_getscratchpad(v,-1))+1)*sizeof(SQChar));
-			retval=1;
-		}
-		i=scstrlen(buffer);
-		if(i>0){
-			SQInteger oldtop=sq_gettop(v);
-			if(SQ_SUCCEEDED(sq_compilebuffer(v,buffer,i,_SC("interactive console"),SQTrue))){
-				sq_pushroottable(v);
-				if(SQ_SUCCEEDED(sq_call(v,1,retval,SQTrue)) &&	retval){
-					scprintf(_SC("\n"));
-					sq_pushroottable(v);
-					sq_pushstring(v,_SC("print"),-1);
-					sq_get(v,-2);
-					sq_pushroottable(v);
-					sq_push(v,-4);
-					sq_call(v,2,SQFalse,SQTrue);
-					retval=0;
-					scprintf(_SC("\n"));
-				}
-			}
-
-			sq_settop(v,oldtop);
-		}
-	}
-}
-
-int main(int argc, char* argv[])
-{
-	HSQUIRRELVM v;
-
-	const SQChar *filename=NULL;
-#if defined(_MSC_VER) && defined(_DEBUG)
-	_CrtSetAllocHook(MemAllocHook);
-#endif
-
-	v=sq_open(1024);
-	sq_setprintfunc(v,printfunc);
-
-	sq_pushroottable(v);
-
-	sqstd_register_bloblib(v);
-	sqstd_register_iolib(v);
-	sqstd_register_systemlib(v);
-	sqstd_register_mathlib(v);
-	sqstd_register_stringlib(v);
-
-	//aux library
-	//sets error handlers
-	sqstd_seterrorhandlers(v);
-
-	//gets arguments
-	switch(getargs(v,argc,argv))
-	{
-	case _INTERACTIVE:
-		Interactive(v);
-		break;
-	case _DONE:
-	default:
-		break;
-	}
-
-	sq_close(v);
-
-#if defined(_MSC_VER) && defined(_DEBUG)
-	_getch();
-	_CrtMemDumpAllObjectsSince( NULL );
-#endif
-	return 0;
-}
-
@@ -1,101 +0,0 @@
-# Microsoft Developer Studio Project File - Name="sq" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=sq - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "sq.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "sq.mak" CFG="sq - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "sq - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "sq - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_LocalPath ".."
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "sq - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /I "..\sqstdlib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x410 /d "NDEBUG"
-# ADD RSC /l 0x410 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 squirrel.lib sqstdlib.lib /nologo /subsystem:console /machine:I386 /out:"../bin/sq.exe" /libpath:"../lib"
-
-!ELSEIF  "$(CFG)" == "sq - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\include" /I "..\sqstdlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x410 /d "_DEBUG"
-# ADD RSC /l 0x410 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 squirrel.lib sqstdlib.lib /nologo /subsystem:console /debug /machine:I386 /out:"../bin/sq.exe" /pdbtype:sept /libpath:"../lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "sq - Win32 Release"
-# Name "sq - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\sq.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
@@ -1,31 +0,0 @@
-SQUIRREL= ..
-
-
-OUT= $(SQUIRREL)/lib/libsqstdlib.a
-INCZ= -I$(SQUIRREL)/include -I. -Iinclude
-
-SRCS= \
-	sqstdblob.cpp \
-	sqstdio.cpp \
-	sqstdstream.cpp \
-	sqstdmath.cpp \
-	sqstdsystem.cpp \
-	sqstdstring.cpp \
-	sqstdaux.cpp \
-	sqstdrex.cpp
-
-
-sq32:
-	gcc -O2  -fno-rtti -Wall -c $(SRCS) $(INCZ)
-	ar rc $(OUT) *.o
-
-sqprof:
-	gcc -O2 -pg -fno-rtti -pie -gstabs -g3 -Wall -c $(SRCS) $(INCZ)
-	ar rc $(OUT) *.o
-
-sq64:
-	gcc -O2 -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ)
-	ar rc $(OUT) *.o
-
-clean:
-	rm -f $(OUT) $(SRCS:%.cpp=%.o)
@@ -1,129 +0,0 @@
-/* see copyright notice in squirrel.h */
-#include <squirrel.h>
-#include <sqstdaux.h>
-#include <assert.h>
-
-void sqstd_printcallstack(HSQUIRRELVM v)
-{
-	SQPRINTFUNCTION pf = sq_getprintfunc(v);
-	if(pf) {
-		SQStackInfos si;
-		SQInteger i;
-		SQFloat f;
-		const SQChar *s;
-		SQInteger level=1; //1 is to skip this function that is level 0
-		const SQChar *name=0;
-		SQInteger seq=0;
-		pf(v,_SC("\nCALLSTACK\n"));
-		while(SQ_SUCCEEDED(sq_stackinfos(v,level,&si)))
-		{
-			const SQChar *fn=_SC("unknown");
-			const SQChar *src=_SC("unknown");
-			if(si.funcname)fn=si.funcname;
-			if(si.source)src=si.source;
-			pf(v,_SC("*FUNCTION [%s()] %s line [%d]\n"),fn,src,si.line);
-			level++;
-		}
-		level=0;
-		pf(v,_SC("\nLOCALS\n"));
-
-		for(level=0;level<10;level++){
-			seq=0;
-			while((name = sq_getlocal(v,level,seq)))
-			{
-				seq++;
-				switch(sq_gettype(v,-1))
-				{
-				case OT_NULL:
-					pf(v,_SC("[%s] NULL\n"),name);
-					break;
-				case OT_INTEGER:
-					sq_getinteger(v,-1,&i);
-					pf(v,_SC("[%s] %d\n"),name,i);
-					break;
-				case OT_FLOAT:
-					sq_getfloat(v,-1,&f);
-					pf(v,_SC("[%s] %.14g\n"),name,f);
-					break;
-				case OT_USERPOINTER:
-					pf(v,_SC("[%s] USERPOINTER\n"),name);
-					break;
-				case OT_STRING:
-					sq_getstring(v,-1,&s);
-					pf(v,_SC("[%s] \"%s\"\n"),name,s);
-					break;
-				case OT_TABLE:
-					pf(v,_SC("[%s] TABLE\n"),name);
-					break;
-				case OT_ARRAY:
-					pf(v,_SC("[%s] ARRAY\n"),name);
-					break;
-				case OT_CLOSURE:
-					pf(v,_SC("[%s] CLOSURE\n"),name);
-					break;
-				case OT_NATIVECLOSURE:
-					pf(v,_SC("[%s] NATIVECLOSURE\n"),name);
-					break;
-				case OT_GENERATOR:
-					pf(v,_SC("[%s] GENERATOR\n"),name);
-					break;
-				case OT_USERDATA:
-					pf(v,_SC("[%s] USERDATA\n"),name);
-					break;
-				case OT_THREAD:
-					pf(v,_SC("[%s] THREAD\n"),name);
-					break;
-				case OT_CLASS:
-					pf(v,_SC("[%s] CLASS\n"),name);
-					break;
-				case OT_INSTANCE:
-					pf(v,_SC("[%s] INSTANCE\n"),name);
-					break;
-				case OT_WEAKREF:
-					pf(v,_SC("[%s] WEAKREF\n"),name);
-					break;
-				case OT_BOOL:{
-					sq_getinteger(v,-1,&i);
-					pf(v,_SC("[%s] %s\n"),name,i?_SC("true"):_SC("false"));
-							 }
-					break;
-				default: assert(0); break;
-				}
-				sq_pop(v,1);
-			}
-		}
-	}
-}
-
-static SQInteger _sqstd_aux_printerror(HSQUIRRELVM v)
-{
-	SQPRINTFUNCTION pf = sq_getprintfunc(v);
-	if(pf) {
-		const SQChar *sErr = 0;
-		if(sq_gettop(v)>=1) {
-			if(SQ_SUCCEEDED(sq_getstring(v,2,&sErr)))	{
-				pf(v,_SC("\nAN ERROR HAS OCCURED [%s]\n"),sErr);
-			}
-			else{
-				pf(v,_SC("\nAN ERROR HAS OCCURED [unknown]\n"));
-			}
-			sqstd_printcallstack(v);
-		}
-	}
-	return 0;
-}
-
-void _sqstd_compiler_error(HSQUIRRELVM v,const SQChar *sErr,const SQChar *sSource,SQInteger line,SQInteger column)
-{
-	SQPRINTFUNCTION pf = sq_getprintfunc(v);
-	if(pf) {
-		pf(v,_SC("%s line = (%d) column = (%d) : error %s\n"),sSource,line,column,sErr);
-	}
-}
-
-void sqstd_seterrorhandlers(HSQUIRRELVM v)
-{
-	sq_setcompilererrorhandler(v,_sqstd_compiler_error);
-	sq_newclosure(v,_sqstd_aux_printerror,0);
-	sq_seterrorhandler(v);
-}
@@ -1,251 +0,0 @@
-/* see copyright notice in squirrel.h */
-#include <new>
-#include <squirrel.h>
-#include <sqstdio.h>
-#include <string.h>
-#include <sqstdblob.h>
-#include "sqstdstream.h"
-#include "sqstdblobimpl.h"
-
-#define SQSTD_BLOB_TYPE_TAG (SQSTD_STREAM_TYPE_TAG | 0x00000002)
-
-//Blob
-
-
-#define SETUP_BLOB(v) \
-	SQBlob *self = NULL; \
-	{ if(SQ_FAILED(sq_getinstanceup(v,1,(SQUserPointer*)&self,(SQUserPointer)SQSTD_BLOB_TYPE_TAG))) \
-		return SQ_ERROR; }
-
-
-static SQInteger _blob_resize(HSQUIRRELVM v)
-{
-	SETUP_BLOB(v);
-	SQInteger size;
-	sq_getinteger(v,2,&size);
-	if(!self->Resize(size))
-		return sq_throwerror(v,_SC("resize failed"));
-	return 0;
-}
-
-static void __swap_dword(unsigned int *n)
-{
-	*n=(unsigned int)(((*n&0xFF000000)>>24)  |
-			((*n&0x00FF0000)>>8)  |
-			((*n&0x0000FF00)<<8)  |
-			((*n&0x000000FF)<<24));
-}
-
-static void __swap_word(unsigned short *n)
-{
-	*n=(unsigned short)((*n>>8)&0x00FF)| ((*n<<8)&0xFF00);
-}
-
-static SQInteger _blob_swap4(HSQUIRRELVM v)
-{
-	SETUP_BLOB(v);
-	SQInteger num=(self->Len()-(self->Len()%4))>>2;
-	unsigned int *t=(unsigned int *)self->GetBuf();
-	for(SQInteger i = 0; i < num; i++) {
-		__swap_dword(&t[i]);
-	}
-	return 0;
-}
-
-static SQInteger _blob_swap2(HSQUIRRELVM v)
-{
-	SETUP_BLOB(v);
-	SQInteger num=(self->Len()-(self->Len()%2))>>1;
-	unsigned short *t = (unsigned short *)self->GetBuf();
-	for(SQInteger i = 0; i < num; i++) {
-		__swap_word(&t[i]);
-	}
-	return 0;
-}
-
-static SQInteger _blob__set(HSQUIRRELVM v)
-{
-	SETUP_BLOB(v);
-	SQInteger idx,val;
-	sq_getinteger(v,2,&idx);
-	sq_getinteger(v,3,&val);
-	if(idx < 0 || idx >= self->Len())
-		return sq_throwerror(v,_SC("index out of range"));
-	((unsigned char *)self->GetBuf())[idx] = (unsigned char) val;
-	sq_push(v,3);
-	return 1;
-}
-
-static SQInteger _blob__get(HSQUIRRELVM v)
-{
-	SETUP_BLOB(v);
-	SQInteger idx;
-	sq_getinteger(v,2,&idx);
-	if(idx < 0 || idx >= self->Len())
-		return sq_throwerror(v,_SC("index out of range"));
-	sq_pushinteger(v,((unsigned char *)self->GetBuf())[idx]);
-	return 1;
-}
-
-static SQInteger _blob__nexti(HSQUIRRELVM v)
-{
-	SETUP_BLOB(v);
-	if(sq_gettype(v,2) == OT_NULL) {
-		sq_pushinteger(v, 0);
-		return 1;
-	}
-	SQInteger idx;
-	if(SQ_SUCCEEDED(sq_getinteger(v, 2, &idx))) {
-		if(idx+1 < self->Len()) {
-			sq_pushinteger(v, idx+1);
-			return 1;
-		}
-		sq_pushnull(v);
-		return 1;
-	}
-	return sq_throwerror(v,_SC("internal error (_nexti) wrong argument type"));
-}
-
-static SQInteger _blob__typeof(HSQUIRRELVM v)
-{
-	sq_pushstring(v,_SC("blob"),-1);
-	return 1;
-}
-
-static SQInteger _blob_releasehook(SQUserPointer p, SQInteger size)
-{
-	SQBlob *self = (SQBlob*)p;
-	delete self;
-	return 1;
-}
-
-static SQInteger _blob_constructor(HSQUIRRELVM v)
-{
-	SQInteger nparam = sq_gettop(v);
-	SQInteger size = 0;
-	if(nparam == 2) {
-		sq_getinteger(v, 2, &size);
-	}
-	if(size < 0) return sq_throwerror(v, _SC("cannot create blob with negative size"));
-	SQBlob *b = new SQBlob(size);
-	if(SQ_FAILED(sq_setinstanceup(v,1,b))) {
-		delete b;
-		return sq_throwerror(v, _SC("cannot create blob with negative size"));
-	}
-	sq_setreleasehook(v,1,_blob_releasehook);
-	return 0;
-}
-
-#define _DECL_BLOB_FUNC(name,nparams,typecheck) {_SC(#name),_blob_##name,nparams,typecheck}
-static SQRegFunction _blob_methods[] = {
-	_DECL_BLOB_FUNC(constructor,-1,_SC("xn")),
-	_DECL_BLOB_FUNC(resize,2,_SC("xn")),
-	_DECL_BLOB_FUNC(swap2,1,_SC("x")),
-	_DECL_BLOB_FUNC(swap4,1,_SC("x")),
-	_DECL_BLOB_FUNC(_set,3,_SC("xnn")),
-	_DECL_BLOB_FUNC(_get,2,_SC("xn")),
-	_DECL_BLOB_FUNC(_typeof,1,_SC("x")),
-	_DECL_BLOB_FUNC(_nexti,2,_SC("x")),
-	{0,0,0,0}
-};
-
-
-
-//GLOBAL FUNCTIONS
-
-static SQInteger _g_blob_casti2f(HSQUIRRELVM v)
-{
-	SQInteger i;
-	sq_getinteger(v,2,&i);
-	sq_pushfloat(v,*((SQFloat *)&i));
-	return 1;
-}
-
-static SQInteger _g_blob_castf2i(HSQUIRRELVM v)
-{
-	SQFloat f;
-	sq_getfloat(v,2,&f);
-	sq_pushinteger(v,*((SQInteger *)&f));
-	return 1;
-}
-
-static SQInteger _g_blob_swap2(HSQUIRRELVM v)
-{
-	SQInteger i;
-	sq_getinteger(v,2,&i);
-	short s=(short)i;
-	sq_pushinteger(v,(s<<8)|((s>>8)&0x00FF));
-	return 1;
-}
-
-static SQInteger _g_blob_swap4(HSQUIRRELVM v)
-{
-	SQInteger i;
-	sq_getinteger(v,2,&i);
-	unsigned int t4 = (unsigned int)i;
-	__swap_dword(&t4);
-	sq_pushinteger(v,(SQInteger)t4);
-	return 1;
-}
-
-static SQInteger _g_blob_swapfloat(HSQUIRRELVM v)
-{
-	SQFloat f;
-	sq_getfloat(v,2,&f);
-	__swap_dword((unsigned int *)&f);
-	sq_pushfloat(v,f);
-	return 1;
-}
-
-#define _DECL_GLOBALBLOB_FUNC(name,nparams,typecheck) {_SC(#name),_g_blob_##name,nparams,typecheck}
-static SQRegFunction bloblib_funcs[]={
-	_DECL_GLOBALBLOB_FUNC(casti2f,2,_SC(".n")),
-	_DECL_GLOBALBLOB_FUNC(castf2i,2,_SC(".n")),
-	_DECL_GLOBALBLOB_FUNC(swap2,2,_SC(".n")),
-	_DECL_GLOBALBLOB_FUNC(swap4,2,_SC(".n")),
-	_DECL_GLOBALBLOB_FUNC(swapfloat,2,_SC(".n")),
-	{0,0,0,0}
-};
-
-SQRESULT sqstd_getblob(HSQUIRRELVM v,SQInteger idx,SQUserPointer *ptr)
-{
-	SQBlob *blob;
-	if(SQ_FAILED(sq_getinstanceup(v,idx,(SQUserPointer *)&blob,(SQUserPointer)SQSTD_BLOB_TYPE_TAG)))
-		return -1;
-	*ptr = blob->GetBuf();
-	return SQ_OK;
-}
-
-SQInteger sqstd_getblobsize(HSQUIRRELVM v,SQInteger idx)
-{
-	SQBlob *blob;
-	if(SQ_FAILED(sq_getinstanceup(v,idx,(SQUserPointer *)&blob,(SQUserPointer)SQSTD_BLOB_TYPE_TAG)))
-		return -1;
-	return blob->Len();
-}
-
-SQUserPointer sqstd_createblob(HSQUIRRELVM v, SQInteger size)
-{
-	SQInteger top = sq_gettop(v);
-	sq_pushregistrytable(v);
-	sq_pushstring(v,_SC("std_blob"),-1);
-	if(SQ_SUCCEEDED(sq_get(v,-2))) {
-		sq_remove(v,-2); //removes the registry
-		sq_push(v,1); // push the this
-		sq_pushinteger(v,size); //size
-		SQBlob *blob = NULL;
-		if(SQ_SUCCEEDED(sq_call(v,2,SQTrue,SQFalse))
-			&& SQ_SUCCEEDED(sq_getinstanceup(v,-1,(SQUserPointer *)&blob,(SQUserPointer)SQSTD_BLOB_TYPE_TAG))) {
-			sq_remove(v,-2);
-			return blob->GetBuf();
-		}
-	}
-	sq_settop(v,top);
-	return NULL;
-}
-
-SQRESULT sqstd_register_bloblib(HSQUIRRELVM v)
-{
-	return declare_stream(v,_SC("blob"),(SQUserPointer)SQSTD_BLOB_TYPE_TAG,_SC("std_blob"),_blob_methods,bloblib_funcs);
-}
-
@@ -1,108 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQSTD_BLOBIMPL_H_
-#define _SQSTD_BLOBIMPL_H_
-
-struct SQBlob : public SQStream
-{
-	SQBlob(SQInteger size) {
-		_size = size;
-		_allocated = size;
-		_buf = (unsigned char *)sq_malloc(size);
-		memset(_buf, 0, _size);
-		_ptr = 0;
-		_owns = true;
-	}
-	virtual ~SQBlob() {
-		sq_free(_buf, _allocated);
-	}
-	SQInteger Write(void *buffer, SQInteger size) {
-		if(!CanAdvance(size)) {
-			GrowBufOf(_ptr + size - _size);
-		}
-		memcpy(&_buf[_ptr], buffer, size);
-		_ptr += size;
-		return size;
-	}
-	SQInteger Read(void *buffer,SQInteger size) {
-		SQInteger n = size;
-		if(!CanAdvance(size)) {
-			if((_size - _ptr) > 0)
-				n = _size - _ptr;
-			else return 0;
-		}
-		memcpy(buffer, &_buf[_ptr], n);
-		_ptr += n;
-		return n;
-	}
-	bool Resize(SQInteger n) {
-		if(!_owns) return false;
-		if(n != _allocated) {
-			unsigned char *newbuf = (unsigned char *)sq_malloc(n);
-			memset(newbuf,0,n);
-			if(_size > n)
-				memcpy(newbuf,_buf,n);
-			else
-				memcpy(newbuf,_buf,_size);
-			sq_free(_buf,_allocated);
-			_buf=newbuf;
-			_allocated = n;
-			if(_size > _allocated)
-				_size = _allocated;
-			if(_ptr > _allocated)
-				_ptr = _allocated;
-		}
-		return true;
-	}
-	bool GrowBufOf(SQInteger n)
-	{
-		bool ret = true;
-		if(_size + n > _allocated) {
-			if(_size + n > _size * 2)
-				ret = Resize(_size + n);
-			else
-				ret = Resize(_size * 2);
-		}
-		_size = _size + n;
-		return ret;
-	}
-	bool CanAdvance(SQInteger n) {
-		if(_ptr+n>_size)return false;
-		return true;
-	}
-	SQInteger Seek(SQInteger offset, SQInteger origin) {
-		switch(origin) {
-			case SQ_SEEK_SET:
-				if(offset > _size || offset < 0) return -1;
-				_ptr = offset;
-				break;
-			case SQ_SEEK_CUR:
-				if(_ptr + offset > _size || _ptr + offset < 0) return -1;
-				_ptr += offset;
-				break;
-			case SQ_SEEK_END:
-				if(_size + offset > _size || _size + offset < 0) return -1;
-				_ptr = _size + offset;
-				break;
-			default: return -1;
-		}
-		return 0;
-	}
-	bool IsValid() {
-		return _buf?true:false;
-	}
-	bool EOS() {
-		return _ptr == _size;
-	}
-	SQInteger Flush() { return 0; }
-	SQInteger Tell() { return _ptr; }
-	SQInteger Len() { return _size; }
-	SQUserPointer GetBuf(){ return _buf; }
-private:
-	SQInteger _size;
-	SQInteger _allocated;
-	SQInteger _ptr;
-	unsigned char *_buf;
-	bool _owns;
-};
-
-#endif //_SQSTD_BLOBIMPL_H_
@@ -1,410 +0,0 @@
-/* see copyright notice in squirrel.h */
-#include <stdio.h>
-#include <squirrel.h>
-#include <new>
-#include <sqstdio.h>
-#include "sqstdstream.h"
-
-#define SQSTD_FILE_TYPE_TAG (SQSTD_STREAM_TYPE_TAG | 0x00000001)
-//basic API
-SQFILE sqstd_fopen(const SQChar *filename ,const SQChar *mode)
-{
-#ifndef SQUNICODE
-	return (SQFILE)fopen(filename,mode);
-#else
-	return (SQFILE)_wfopen(filename,mode);
-#endif
-}
-
-SQInteger sqstd_fread(void* buffer, SQInteger size, SQInteger count, SQFILE file)
-{
-	return (SQInteger)fread(buffer,size,count,(FILE *)file);
-}
-
-SQInteger sqstd_fwrite(const SQUserPointer buffer, SQInteger size, SQInteger count, SQFILE file)
-{
-	return (SQInteger)fwrite(buffer,size,count,(FILE *)file);
-}
-
-SQInteger sqstd_fseek(SQFILE file, SQInteger offset, SQInteger origin)
-{
-	SQInteger realorigin;
-	switch(origin) {
-		case SQ_SEEK_CUR: realorigin = SEEK_CUR; break;
-		case SQ_SEEK_END: realorigin = SEEK_END; break;
-		case SQ_SEEK_SET: realorigin = SEEK_SET; break;
-		default: return -1; //failed
-	}
-	return fseek((FILE *)file,(long)offset,(int)realorigin);
-}
-
-SQInteger sqstd_ftell(SQFILE file)
-{
-	return ftell((FILE *)file);
-}
-
-SQInteger sqstd_fflush(SQFILE file)
-{
-	return fflush((FILE *)file);
-}
-
-SQInteger sqstd_fclose(SQFILE file)
-{
-	return fclose((FILE *)file);
-}
-
-SQInteger sqstd_feof(SQFILE file)
-{
-	return feof((FILE *)file);
-}
-
-//File
-struct SQFile : public SQStream {
-	SQFile() { _handle = NULL; _owns = false;}
-	SQFile(SQFILE file, bool owns) { _handle = file; _owns = owns;}
-	virtual ~SQFile() { Close(); }
-	bool Open(const SQChar *filename ,const SQChar *mode) {
-		Close();
-		if( (_handle = sqstd_fopen(filename,mode)) ) {
-			_owns = true;
-			return true;
-		}
-		return false;
-	}
-	void Close() {
-		if(_handle && _owns) {
-			sqstd_fclose(_handle);
-			_handle = NULL;
-			_owns = false;
-		}
-	}
-	SQInteger Read(void *buffer,SQInteger size) {
-		return sqstd_fread(buffer,1,size,_handle);
-	}
-	SQInteger Write(void *buffer,SQInteger size) {
-		return sqstd_fwrite(buffer,1,size,_handle);
-	}
-	SQInteger Flush() {
-		return sqstd_fflush(_handle);
-	}
-	SQInteger Tell() {
-		return sqstd_ftell(_handle);
-	}
-	SQInteger Len() {
-		SQInteger prevpos=Tell();
-		Seek(0,SQ_SEEK_END);
-		SQInteger size=Tell();
-		Seek(prevpos,SQ_SEEK_SET);
-		return size;
-	}
-	SQInteger Seek(SQInteger offset, SQInteger origin)	{
-		return sqstd_fseek(_handle,offset,origin);
-	}
-	bool IsValid() { return _handle?true:false; }
-	bool EOS() { return Tell()==Len()?true:false;}
-	SQFILE GetHandle() {return _handle;}
-private:
-	SQFILE _handle;
-	bool _owns;
-};
-
-static SQInteger _file__typeof(HSQUIRRELVM v)
-{
-	sq_pushstring(v,_SC("file"),-1);
-	return 1;
-}
-
-static SQInteger _file_releasehook(SQUserPointer p, SQInteger size)
-{
-	SQFile *self = (SQFile*)p;
-	delete self;
-	return 1;
-}
-
-static SQInteger _file_constructor(HSQUIRRELVM v)
-{
-	const SQChar *filename,*mode;
-	bool owns = true;
-	SQFile *f;
-	SQFILE newf;
-	if(sq_gettype(v,2) == OT_STRING && sq_gettype(v,3) == OT_STRING) {
-		sq_getstring(v, 2, &filename);
-		sq_getstring(v, 3, &mode);
-		newf = sqstd_fopen(filename, mode);
-		if(!newf) return sq_throwerror(v, _SC("cannot open file"));
-	} else if(sq_gettype(v,2) == OT_USERPOINTER) {
-		owns = !(sq_gettype(v,3) == OT_NULL);
-		sq_getuserpointer(v,2,&newf);
-	} else {
-		return sq_throwerror(v,_SC("wrong parameter"));
-	}
-	f = new SQFile(newf,owns);
-	if(SQ_FAILED(sq_setinstanceup(v,1,f))) {
-		delete f;
-		return sq_throwerror(v, _SC("cannot create blob with negative size"));
-	}
-	sq_setreleasehook(v,1,_file_releasehook);
-	return 0;
-}
-
-//bindings
-#define _DECL_FILE_FUNC(name,nparams,typecheck) {_SC(#name),_file_##name,nparams,typecheck}
-static SQRegFunction _file_methods[] = {
-	_DECL_FILE_FUNC(constructor,3,_SC("x")),
-	_DECL_FILE_FUNC(_typeof,1,_SC("x")),
-	{0,0,0,0},
-};
-
-
-
-SQRESULT sqstd_createfile(HSQUIRRELVM v, SQFILE file,SQBool own)
-{
-	SQInteger top = sq_gettop(v);
-	sq_pushregistrytable(v);
-	sq_pushstring(v,_SC("std_file"),-1);
-	if(SQ_SUCCEEDED(sq_get(v,-2))) {
-		sq_remove(v,-2); //removes the registry
-		sq_pushroottable(v); // push the this
-		sq_pushuserpointer(v,file); //file
-		if(own){
-			sq_pushinteger(v,1); //true
-		}
-		else{
-			sq_pushnull(v); //false
-		}
-		if(SQ_SUCCEEDED( sq_call(v,3,SQTrue,SQFalse) )) {
-			sq_remove(v,-2);
-			return SQ_OK;
-		}
-	}
-	sq_settop(v,top);
-	return SQ_OK;
-}
-
-SQRESULT sqstd_getfile(HSQUIRRELVM v, SQInteger idx, SQFILE *file)
-{
-	SQFile *fileobj = NULL;
-	if(SQ_SUCCEEDED(sq_getinstanceup(v,idx,(SQUserPointer*)&fileobj,(SQUserPointer)SQSTD_FILE_TYPE_TAG))) {
-		*file = fileobj->GetHandle();
-		return SQ_OK;
-	}
-	return sq_throwerror(v,_SC("not a file"));
-}
-
-
-
-static SQInteger _io_file_lexfeed_ASCII(SQUserPointer file)
-{
-	SQInteger ret;
-	char c;
-	if( ( ret=sqstd_fread(&c,sizeof(c),1,(FILE *)file )>0) )
-		return c;
-	return 0;
-}
-
-static SQInteger _io_file_lexfeed_UTF8(SQUserPointer file)
-{
-#define READ() \
-	if(sqstd_fread(&inchar,sizeof(inchar),1,(FILE *)file) != 1) \
-		return 0;
-
-	static const SQInteger utf8_lengths[16] =
-	{
-		1,1,1,1,1,1,1,1,        /* 0000 to 0111 : 1 byte (plain ASCII) */
-		0,0,0,0,                /* 1000 to 1011 : not valid */
-		2,2,                    /* 1100, 1101 : 2 bytes */
-		3,                      /* 1110 : 3 bytes */
-		4                       /* 1111 :4 bytes */
-	};
-	static unsigned char byte_masks[5] = {0,0,0x1f,0x0f,0x07};
-	unsigned char inchar;
-	SQInteger c = 0;
-	READ();
-	c = inchar;
-	//
-	if(c >= 0x80) {
-		SQInteger tmp;
-		SQInteger codelen = utf8_lengths[c>>4];
-		if(codelen == 0)
-			return 0;
-			//"invalid UTF-8 stream";
-		tmp = c&byte_masks[codelen];
-		for(SQInteger n = 0; n < codelen-1; n++) {
-			tmp<<=6;
-			READ();
-			tmp |= inchar & 0x3F;
-		}
-		c = tmp;
-	}
-	return c;
-}
-
-static SQInteger _io_file_lexfeed_UCS2_LE(SQUserPointer file)
-{
-	SQInteger ret;
-	wchar_t c;
-	if( ( ret=sqstd_fread(&c,sizeof(c),1,(FILE *)file )>0) )
-		return (SQChar)c;
-	return 0;
-}
-
-static SQInteger _io_file_lexfeed_UCS2_BE(SQUserPointer file)
-{
-	SQInteger ret;
-	unsigned short c;
-	if( ( ret=sqstd_fread(&c,sizeof(c),1,(FILE *)file )>0) ) {
-		c = ((c>>8)&0x00FF)| ((c<<8)&0xFF00);
-		return (SQChar)c;
-	}
-	return 0;
-}
-
-SQInteger file_read(SQUserPointer file,SQUserPointer buf,SQInteger size)
-{
-	SQInteger ret;
-	if( ( ret = sqstd_fread(buf,1,size,(SQFILE)file ))!=0 )return ret;
-	return -1;
-}
-
-SQInteger file_write(SQUserPointer file,SQUserPointer p,SQInteger size)
-{
-	return sqstd_fwrite(p,1,size,(SQFILE)file);
-}
-
-SQRESULT sqstd_loadfile(HSQUIRRELVM v,const SQChar *filename,SQBool printerror)
-{
-	SQFILE file = sqstd_fopen(filename,_SC("rb"));
-	SQInteger ret;
-	unsigned short us;
-	unsigned char uc;
-	SQLEXREADFUNC func = _io_file_lexfeed_ASCII;
-	if(file){
-		ret = sqstd_fread(&us,1,2,file);
-		if(ret != 2) {
-			//probably an empty file
-			us = 0;
-		}
-		if(us == SQ_BYTECODE_STREAM_TAG) { //BYTECODE
-			sqstd_fseek(file,0,SQ_SEEK_SET);
-			if(SQ_SUCCEEDED(sq_readclosure(v,file_read,file))) {
-				sqstd_fclose(file);
-				return SQ_OK;
-			}
-		}
-		else { //SCRIPT
-			switch(us)
-			{
-				//gotta swap the next 2 lines on BIG endian machines
-				case 0xFFFE: func = _io_file_lexfeed_UCS2_BE; break;//UTF-16 little endian;
-				case 0xFEFF: func = _io_file_lexfeed_UCS2_LE; break;//UTF-16 big endian;
-				case 0xBBEF:
-					if(sqstd_fread(&uc,1,sizeof(uc),file) == 0) {
-						sqstd_fclose(file);
-						return sq_throwerror(v,_SC("io error"));
-					}
-					if(uc != 0xBF) {
-						sqstd_fclose(file);
-						return sq_throwerror(v,_SC("Unrecognozed ecoding"));
-					}
-					func = _io_file_lexfeed_UTF8;
-					break;//UTF-8 ;
-				default: sqstd_fseek(file,0,SQ_SEEK_SET); break; // ascii
-			}
-
-			if(SQ_SUCCEEDED(sq_compile(v,func,file,filename,printerror))){
-				sqstd_fclose(file);
-				return SQ_OK;
-			}
-		}
-		sqstd_fclose(file);
-		return SQ_ERROR;
-	}
-	return sq_throwerror(v,_SC("cannot open the file"));
-}
-
-SQRESULT sqstd_dofile(HSQUIRRELVM v,const SQChar *filename,SQBool retval,SQBool printerror)
-{
-	if(SQ_SUCCEEDED(sqstd_loadfile(v,filename,printerror))) {
-		sq_push(v,-2);
-		if(SQ_SUCCEEDED(sq_call(v,1,retval,SQTrue))) {
-			sq_remove(v,retval?-2:-1); //removes the closure
-			return 1;
-		}
-		sq_pop(v,1); //removes the closure
-	}
-	return SQ_ERROR;
-}
-
-SQRESULT sqstd_writeclosuretofile(HSQUIRRELVM v,const SQChar *filename)
-{
-	SQFILE file = sqstd_fopen(filename,_SC("wb+"));
-	if(!file) return sq_throwerror(v,_SC("cannot open the file"));
-	if(SQ_SUCCEEDED(sq_writeclosure(v,file_write,file))) {
-		sqstd_fclose(file);
-		return SQ_OK;
-	}
-	sqstd_fclose(file);
-	return SQ_ERROR; //forward the error
-}
-
-SQInteger _g_io_loadfile(HSQUIRRELVM v)
-{
-	const SQChar *filename;
-	SQBool printerror = SQFalse;
-	sq_getstring(v,2,&filename);
-	if(sq_gettop(v) >= 3) {
-		sq_getbool(v,3,&printerror);
-	}
-	if(SQ_SUCCEEDED(sqstd_loadfile(v,filename,printerror)))
-		return 1;
-	return SQ_ERROR; //propagates the error
-}
-
-SQInteger _g_io_writeclosuretofile(HSQUIRRELVM v)
-{
-	const SQChar *filename;
-	sq_getstring(v,2,&filename);
-	if(SQ_SUCCEEDED(sqstd_writeclosuretofile(v,filename)))
-		return 1;
-	return SQ_ERROR; //propagates the error
-}
-
-SQInteger _g_io_dofile(HSQUIRRELVM v)
-{
-	const SQChar *filename;
-	SQBool printerror = SQFalse;
-	sq_getstring(v,2,&filename);
-	if(sq_gettop(v) >= 3) {
-		sq_getbool(v,3,&printerror);
-	}
-	sq_push(v,1); //repush the this
-	if(SQ_SUCCEEDED(sqstd_dofile(v,filename,SQTrue,printerror)))
-		return 1;
-	return SQ_ERROR; //propagates the error
-}
-
-#define _DECL_GLOBALIO_FUNC(name,nparams,typecheck) {_SC(#name),_g_io_##name,nparams,typecheck}
-static SQRegFunction iolib_funcs[]={
-	_DECL_GLOBALIO_FUNC(loadfile,-2,_SC(".sb")),
-	_DECL_GLOBALIO_FUNC(dofile,-2,_SC(".sb")),
-	_DECL_GLOBALIO_FUNC(writeclosuretofile,3,_SC(".sc")),
-	{0,0,0,0}
-};
-
-SQRESULT sqstd_register_iolib(HSQUIRRELVM v)
-{
-	SQInteger top = sq_gettop(v);
-	//create delegate
-	declare_stream(v,_SC("file"),(SQUserPointer)SQSTD_FILE_TYPE_TAG,_SC("std_file"),_file_methods,iolib_funcs);
-	sq_pushstring(v,_SC("stdout"),-1);
-	sqstd_createfile(v,stdout,SQFalse);
-	sq_createslot(v,-3);
-	sq_pushstring(v,_SC("stdin"),-1);
-	sqstd_createfile(v,stdin,SQFalse);
-	sq_createslot(v,-3);
-	sq_pushstring(v,_SC("stderr"),-1);
-	sqstd_createfile(v,stderr,SQFalse);
-	sq_createslot(v,-3);
-	sq_settop(v,top);
-	return SQ_OK;
-}
@@ -1,131 +0,0 @@
-# Microsoft Developer Studio Project File - Name="sqstdlib" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=sqstdlib - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "sqstdlib.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "sqstdlib.mak" CFG="sqstdlib - Win32 Release"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "sqstdlib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "sqstdlib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_LocalPath ".."
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "sqstdlib - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x410 /d "NDEBUG"
-# ADD RSC /l 0x410 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\sqstdlib.lib"
-
-!ELSEIF  "$(CFG)" == "sqstdlib - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x410 /d "_DEBUG"
-# ADD RSC /l 0x410 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\lib\sqstdlib.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "sqstdlib - Win32 Release"
-# Name "sqstdlib - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\sqstdblob.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sqstdio.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sqstdmath.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sqstdrex.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sqstdstream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sqstdstring.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sqstdaux.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\sqstdsystem.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\sqstdblobimpl.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sqstdstream.h
-# End Source File
-# End Group
-# End Target
-# End Project
@@ -1,106 +0,0 @@
-/* see copyright notice in squirrel.h */
-#include <squirrel.h>
-#include <math.h>
-#include <stdlib.h>
-#include <sqstdmath.h>
-
-#define SINGLE_ARG_FUNC(_funcname) static SQInteger math_##_funcname(HSQUIRRELVM v){ \
-	SQFloat f; \
-	sq_getfloat(v,2,&f); \
-	sq_pushfloat(v,(SQFloat)_funcname(f)); \
-	return 1; \
-}
-
-#define TWO_ARGS_FUNC(_funcname) static SQInteger math_##_funcname(HSQUIRRELVM v){ \
-	SQFloat p1,p2; \
-	sq_getfloat(v,2,&p1); \
-	sq_getfloat(v,3,&p2); \
-	sq_pushfloat(v,(SQFloat)_funcname(p1,p2)); \
-	return 1; \
-}
-
-static SQInteger math_srand(HSQUIRRELVM v)
-{
-	SQInteger i;
-	if(SQ_FAILED(sq_getinteger(v,2,&i)))
-		return sq_throwerror(v,_SC("invalid param"));
-	srand((unsigned int)i);
-	return 0;
-}
-
-static SQInteger math_rand(HSQUIRRELVM v)
-{
-	sq_pushinteger(v,rand());
-	return 1;
-}
-
-static SQInteger math_abs(HSQUIRRELVM v)
-{
-	SQInteger n;
-	sq_getinteger(v,2,&n);
-	sq_pushinteger(v,(SQInteger)abs((int)n));
-	return 1;
-}
-
-SINGLE_ARG_FUNC(sqrt)
-SINGLE_ARG_FUNC(fabs)
-SINGLE_ARG_FUNC(sin)
-SINGLE_ARG_FUNC(cos)
-SINGLE_ARG_FUNC(asin)
-SINGLE_ARG_FUNC(acos)
-SINGLE_ARG_FUNC(log)
-SINGLE_ARG_FUNC(log10)
-SINGLE_ARG_FUNC(tan)
-SINGLE_ARG_FUNC(atan)
-TWO_ARGS_FUNC(atan2)
-TWO_ARGS_FUNC(pow)
-SINGLE_ARG_FUNC(floor)
-SINGLE_ARG_FUNC(ceil)
-SINGLE_ARG_FUNC(exp)
-
-#define _DECL_FUNC(name,nparams,tycheck) {_SC(#name),math_##name,nparams,tycheck}
-static SQRegFunction mathlib_funcs[] = {
-	_DECL_FUNC(sqrt,2,_SC(".n")),
-	_DECL_FUNC(sin,2,_SC(".n")),
-	_DECL_FUNC(cos,2,_SC(".n")),
-	_DECL_FUNC(asin,2,_SC(".n")),
-	_DECL_FUNC(acos,2,_SC(".n")),
-	_DECL_FUNC(log,2,_SC(".n")),
-	_DECL_FUNC(log10,2,_SC(".n")),
-	_DECL_FUNC(tan,2,_SC(".n")),
-	_DECL_FUNC(atan,2,_SC(".n")),
-	_DECL_FUNC(atan2,3,_SC(".nn")),
-	_DECL_FUNC(pow,3,_SC(".nn")),
-	_DECL_FUNC(floor,2,_SC(".n")),
-	_DECL_FUNC(ceil,2,_SC(".n")),
-	_DECL_FUNC(exp,2,_SC(".n")),
-	_DECL_FUNC(srand,2,_SC(".n")),
-	_DECL_FUNC(rand,1,NULL),
-	_DECL_FUNC(fabs,2,_SC(".n")),
-	_DECL_FUNC(abs,2,_SC(".n")),
-	{0,0,0,0},
-};
-
-#ifndef M_PI
-#define M_PI (3.14159265358979323846)
-#endif
-
-SQRESULT sqstd_register_mathlib(HSQUIRRELVM v)
-{
-	SQInteger i=0;
-	while(mathlib_funcs[i].name!=0)	{
-		sq_pushstring(v,mathlib_funcs[i].name,-1);
-		sq_newclosure(v,mathlib_funcs[i].f,0);
-		sq_setparamscheck(v,mathlib_funcs[i].nparamscheck,mathlib_funcs[i].typemask);
-		sq_setnativeclosurename(v,-1,mathlib_funcs[i].name);
-		sq_createslot(v,-3);
-		i++;
-	}
-	sq_pushstring(v,_SC("RAND_MAX"),-1);
-	sq_pushinteger(v,RAND_MAX);
-	sq_createslot(v,-3);
-	sq_pushstring(v,_SC("PI"),-1);
-	sq_pushfloat(v,(SQFloat)M_PI);
-	sq_createslot(v,-3);
-	return SQ_OK;
-}
@@ -1,635 +0,0 @@
-/* see copyright notice in squirrel.h */
-#include <squirrel.h>
-#include <string.h>
-#include <ctype.h>
-#include <exception>
-#include "sqstdstring.h"
-
-#ifdef _UNICODE
-#define scisprint iswprint
-#else
-#define scisprint isprint
-#endif
-
-#ifdef _DEBUG
-#include <stdio.h>
-
-static const SQChar *g_nnames[] =
-{
-	_SC("NONE"),_SC("OP_GREEDY"),	_SC("OP_OR"),
-	_SC("OP_EXPR"),_SC("OP_NOCAPEXPR"),_SC("OP_DOT"),	_SC("OP_CLASS"),
-	_SC("OP_CCLASS"),_SC("OP_NCLASS"),_SC("OP_RANGE"),_SC("OP_CHAR"),
-	_SC("OP_EOL"),_SC("OP_BOL"),_SC("OP_WB")
-};
-
-#endif
-
-#define OP_GREEDY		(MAX_CHAR+1) // * + ? {n}
-#define OP_OR			(MAX_CHAR+2)
-#define OP_EXPR			(MAX_CHAR+3) //parentesis ()
-#define OP_NOCAPEXPR	(MAX_CHAR+4) //parentesis (?:)
-#define OP_DOT			(MAX_CHAR+5)
-#define OP_CLASS		(MAX_CHAR+6)
-#define OP_CCLASS		(MAX_CHAR+7)
-#define OP_NCLASS		(MAX_CHAR+8) //negates class the [^
-#define OP_RANGE		(MAX_CHAR+9)
-#define OP_CHAR			(MAX_CHAR+10)
-#define OP_EOL			(MAX_CHAR+11)
-#define OP_BOL			(MAX_CHAR+12)
-#define OP_WB			(MAX_CHAR+13)
-
-#define SQREX_SYMBOL_ANY_CHAR ('.')
-#define SQREX_SYMBOL_GREEDY_ONE_OR_MORE ('+')
-#define SQREX_SYMBOL_GREEDY_ZERO_OR_MORE ('*')
-#define SQREX_SYMBOL_GREEDY_ZERO_OR_ONE ('?')
-#define SQREX_SYMBOL_BRANCH ('|')
-#define SQREX_SYMBOL_END_OF_STRING ('$')
-#define SQREX_SYMBOL_BEGINNING_OF_STRING ('^')
-#define SQREX_SYMBOL_ESCAPE_CHAR ('\\')
-
-
-typedef int SQRexNodeType;
-
-typedef struct tagSQRexNode{
-	SQRexNodeType type;
-	SQInteger left;
-	SQInteger right;
-	SQInteger next;
-}SQRexNode;
-
-struct SQRex{
-	const SQChar *_eol;
-	const SQChar *_bol;
-	const SQChar *_p;
-	SQInteger _first;
-	SQInteger _op;
-	SQRexNode *_nodes;
-	SQInteger _nallocated;
-	SQInteger _nsize;
-	SQInteger _nsubexpr;
-	SQRexMatch *_matches;
-	SQInteger _currsubexp;
-	const SQChar **_error;
-};
-
-static SQInteger sqstd_rex_list(SQRex *exp);
-
-static SQInteger sqstd_rex_newnode(SQRex *exp, SQRexNodeType type)
-{
-	SQRexNode n;
-	n.type = type;
-	n.next = n.right = n.left = -1;
-	if(type == OP_EXPR)
-		n.right = exp->_nsubexpr++;
-	if(exp->_nallocated < (exp->_nsize + 1)) {
-		SQInteger oldsize = exp->_nallocated;
-		exp->_nallocated *= 2;
-		exp->_nodes = (SQRexNode *)sq_realloc(exp->_nodes, oldsize * sizeof(SQRexNode) ,exp->_nallocated * sizeof(SQRexNode));
-	}
-	exp->_nodes[exp->_nsize++] = n;
-	SQInteger newid = exp->_nsize - 1;
-	return (SQInteger)newid;
-}
-
-static void sqstd_rex_error(SQRex *exp,const SQChar *error)
-{
-	if(exp->_error) *exp->_error = error;
-	throw std::exception();
-}
-
-static void sqstd_rex_expect(SQRex *exp, SQChar n){
-	if((*exp->_p) != n)
-		sqstd_rex_error(exp, _SC("expected paren"));
-	exp->_p++;
-}
-
-static SQChar sqstd_rex_escapechar(SQRex *exp)
-{
-	if(*exp->_p == SQREX_SYMBOL_ESCAPE_CHAR){
-		exp->_p++;
-		switch(*exp->_p) {
-		case 'v': exp->_p++; return '\v';
-		case 'n': exp->_p++; return '\n';
-		case 't': exp->_p++; return '\t';
-		case 'r': exp->_p++; return '\r';
-		case 'f': exp->_p++; return '\f';
-		default: return (*exp->_p++);
-		}
-	} else if(!scisprint(*exp->_p)) sqstd_rex_error(exp,_SC("letter expected"));
-	return (*exp->_p++);
-}
-
-static SQInteger sqstd_rex_charclass(SQRex *exp,SQInteger classid)
-{
-	SQInteger n = sqstd_rex_newnode(exp,OP_CCLASS);
-	exp->_nodes[n].left = classid;
-	return n;
-}
-
-static SQInteger sqstd_rex_charnode(SQRex *exp,SQBool isclass)
-{
-	SQChar t;
-	if(*exp->_p == SQREX_SYMBOL_ESCAPE_CHAR) {
-		exp->_p++;
-		switch(*exp->_p) {
-			case 'n': exp->_p++; return sqstd_rex_newnode(exp,'\n');
-			case 't': exp->_p++; return sqstd_rex_newnode(exp,'\t');
-			case 'r': exp->_p++; return sqstd_rex_newnode(exp,'\r');
-			case 'f': exp->_p++; return sqstd_rex_newnode(exp,'\f');
-			case 'v': exp->_p++; return sqstd_rex_newnode(exp,'\v');
-			case 'a': case 'A': case 'w': case 'W': case 's': case 'S':
-			case 'd': case 'D': case 'x': case 'X': case 'c': case 'C':
-			case 'p': case 'P': case 'l': case 'u':
-				{
-				t = *exp->_p; exp->_p++;
-				return sqstd_rex_charclass(exp,t);
-				}
-			case 'b':
-			case 'B':
-				if(!isclass) {
-					SQInteger node = sqstd_rex_newnode(exp,OP_WB);
-					exp->_nodes[node].left = *exp->_p;
-					exp->_p++;
-					return node;
-				} //else default
-			default:
-				t = *exp->_p; exp->_p++;
-				return sqstd_rex_newnode(exp,t);
-		}
-	}
-	else if(!scisprint(*exp->_p)) {
-
-		sqstd_rex_error(exp,_SC("letter expected"));
-	}
-	t = *exp->_p; exp->_p++;
-	return sqstd_rex_newnode(exp,t);
-}
-static SQInteger sqstd_rex_class(SQRex *exp)
-{
-	SQInteger ret = -1;
-	SQInteger first = -1,chain;
-	if(*exp->_p == SQREX_SYMBOL_BEGINNING_OF_STRING){
-		ret = sqstd_rex_newnode(exp,OP_NCLASS);
-		exp->_p++;
-	}else ret = sqstd_rex_newnode(exp,OP_CLASS);
-
-	if(*exp->_p == ']') sqstd_rex_error(exp,_SC("empty class"));
-	chain = ret;
-	while(*exp->_p != ']' && exp->_p != exp->_eol) {
-		if(*exp->_p == '-' && first != -1){
-			SQInteger r;
-			if(*exp->_p++ == ']') sqstd_rex_error(exp,_SC("unfinished range"));
-			r = sqstd_rex_newnode(exp,OP_RANGE);
-			if((SQChar)first>*exp->_p) sqstd_rex_error(exp,_SC("invalid range"));
-			if(exp->_nodes[first].type == OP_CCLASS) sqstd_rex_error(exp,_SC("cannot use character classes in ranges"));
-			exp->_nodes[r].left = exp->_nodes[first].type;
-			SQInteger t = sqstd_rex_escapechar(exp);
-			exp->_nodes[r].right = t;
-            exp->_nodes[chain].next = r;
-			chain = r;
-			first = -1;
-		}
-		else{
-			if(first!=-1){
-				SQInteger c = first;
-				exp->_nodes[chain].next = c;
-				chain = c;
-				first = sqstd_rex_charnode(exp,SQTrue);
-			}
-			else{
-				first = sqstd_rex_charnode(exp,SQTrue);
-			}
-		}
-	}
-	if(first!=-1){
-		SQInteger c = first;
-		exp->_nodes[chain].next = c;
-		chain = c;
-		first = -1;
-	}
-	/* hack? */
-	exp->_nodes[ret].left = exp->_nodes[ret].next;
-	exp->_nodes[ret].next = -1;
-	return ret;
-}
-
-static SQInteger sqstd_rex_parsenumber(SQRex *exp)
-{
-	SQInteger ret = *exp->_p-'0';
-	SQInteger positions = 10;
-	exp->_p++;
-	while(isdigit(*exp->_p)) {
-		ret = ret*10+(*exp->_p++-'0');
-		if(positions==1000000000) sqstd_rex_error(exp,_SC("overflow in numeric constant"));
-		positions *= 10;
-	};
-	return ret;
-}
-
-static SQInteger sqstd_rex_element(SQRex *exp)
-{
-	SQInteger ret = -1;
-	switch(*exp->_p)
-	{
-	case '(': {
-		SQInteger expr;
-		exp->_p++;
-
-
-		if(*exp->_p =='?') {
-			exp->_p++;
-			sqstd_rex_expect(exp,_SC(':'));
-			expr = sqstd_rex_newnode(exp,OP_NOCAPEXPR);
-		}
-		else
-			expr = sqstd_rex_newnode(exp,OP_EXPR);
-		SQInteger newn = sqstd_rex_list(exp);
-		exp->_nodes[expr].left = newn;
-		ret = expr;
-		sqstd_rex_expect(exp,_SC(')'));
-			  }
-			  break;
-	case '[':
-		exp->_p++;
-		ret = sqstd_rex_class(exp);
-		sqstd_rex_expect(exp,_SC(']'));
-		break;
-	case SQREX_SYMBOL_END_OF_STRING: exp->_p++; ret = sqstd_rex_newnode(exp,OP_EOL);break;
-	case SQREX_SYMBOL_ANY_CHAR: exp->_p++; ret = sqstd_rex_newnode(exp,OP_DOT);break;
-	default:
-		ret = sqstd_rex_charnode(exp,SQFalse);
-		break;
-	}
-
-
-	SQInteger op;
-	SQBool isgreedy = SQFalse;
-	unsigned short p0 = 0, p1 = 0;
-	switch(*exp->_p){
-		case SQREX_SYMBOL_GREEDY_ZERO_OR_MORE: p0 = 0; p1 = 0xFFFF; exp->_p++; isgreedy = SQTrue; break;
-		case SQREX_SYMBOL_GREEDY_ONE_OR_MORE: p0 = 1; p1 = 0xFFFF; exp->_p++; isgreedy = SQTrue; break;
-		case SQREX_SYMBOL_GREEDY_ZERO_OR_ONE: p0 = 0; p1 = 1; exp->_p++; isgreedy = SQTrue; break;
-		case '{':
-			exp->_p++;
-			if(!isdigit(*exp->_p)) sqstd_rex_error(exp,_SC("number expected"));
-			p0 = (unsigned short)sqstd_rex_parsenumber(exp);
-			/*******************************/
-			switch(*exp->_p) {
-		case '}':
-			p1 = p0; exp->_p++;
-			break;
-		case ',':
-			exp->_p++;
-			p1 = 0xFFFF;
-			if(isdigit(*exp->_p)){
-				p1 = (unsigned short)sqstd_rex_parsenumber(exp);
-			}
-			sqstd_rex_expect(exp,_SC('}'));
-			break;
-		default:
-			sqstd_rex_error(exp,_SC(", or } expected"));
-			}
-			/*******************************/
-			isgreedy = SQTrue;
-			break;
-
-	}
-	if(isgreedy) {
-		SQInteger nnode = sqstd_rex_newnode(exp,OP_GREEDY);
-		op = OP_GREEDY;
-		exp->_nodes[nnode].left = ret;
-		exp->_nodes[nnode].right = ((p0)<<16)|p1;
-		ret = nnode;
-	}
-
-	if((*exp->_p != SQREX_SYMBOL_BRANCH) && (*exp->_p != ')') && (*exp->_p != SQREX_SYMBOL_GREEDY_ZERO_OR_MORE) && (*exp->_p != SQREX_SYMBOL_GREEDY_ONE_OR_MORE) && (*exp->_p != '\0')) {
-		SQInteger nnode = sqstd_rex_element(exp);
-		exp->_nodes[ret].next = nnode;
-	}
-
-	return ret;
-}
-
-static SQInteger sqstd_rex_list(SQRex *exp)
-{
-	SQInteger ret=-1,e;
-	if(*exp->_p == SQREX_SYMBOL_BEGINNING_OF_STRING) {
-		exp->_p++;
-		ret = sqstd_rex_newnode(exp,OP_BOL);
-	}
-	e = sqstd_rex_element(exp);
-	if(ret != -1) {
-		exp->_nodes[ret].next = e;
-	}
-	else ret = e;
-
-	if(*exp->_p == SQREX_SYMBOL_BRANCH) {
-		SQInteger temp,tright;
-		exp->_p++;
-		temp = sqstd_rex_newnode(exp,OP_OR);
-		exp->_nodes[temp].left = ret;
-		tright = sqstd_rex_list(exp);
-		exp->_nodes[temp].right = tright;
-		ret = temp;
-	}
-	return ret;
-}
-
-static SQBool sqstd_rex_matchcclass(SQInteger cclass,SQChar c)
-{
-	switch(cclass) {
-	case 'a': return isalpha(c)?SQTrue:SQFalse;
-	case 'A': return !isalpha(c)?SQTrue:SQFalse;
-	case 'w': return (isalnum(c) || c == '_')?SQTrue:SQFalse;
-	case 'W': return (!isalnum(c) && c != '_')?SQTrue:SQFalse;
-	case 's': return isspace(c)?SQTrue:SQFalse;
-	case 'S': return !isspace(c)?SQTrue:SQFalse;
-	case 'd': return isdigit(c)?SQTrue:SQFalse;
-	case 'D': return !isdigit(c)?SQTrue:SQFalse;
-	case 'x': return isxdigit(c)?SQTrue:SQFalse;
-	case 'X': return !isxdigit(c)?SQTrue:SQFalse;
-	case 'c': return iscntrl(c)?SQTrue:SQFalse;
-	case 'C': return !iscntrl(c)?SQTrue:SQFalse;
-	case 'p': return ispunct(c)?SQTrue:SQFalse;
-	case 'P': return !ispunct(c)?SQTrue:SQFalse;
-	case 'l': return islower(c)?SQTrue:SQFalse;
-	case 'u': return isupper(c)?SQTrue:SQFalse;
-	}
-	return SQFalse; /*cannot happen*/
-}
-
-static SQBool sqstd_rex_matchclass(SQRex* exp,SQRexNode *node,SQInteger c)
-{
-	do {
-		switch(node->type) {
-			case OP_RANGE:
-				if(c >= node->left && c <= node->right) return SQTrue;
-				break;
-			case OP_CCLASS:
-				if(sqstd_rex_matchcclass(node->left,c)) return SQTrue;
-				break;
-			default:
-				if(c == node->type)return SQTrue;
-		}
-	} while((node->next != -1) && (node = &exp->_nodes[node->next]));
-	return SQFalse;
-}
-
-static const SQChar *sqstd_rex_matchnode(SQRex* exp,SQRexNode *node,const SQChar *str,SQRexNode *next)
-{
-
-	SQRexNodeType type = node->type;
-	switch(type) {
-	case OP_GREEDY: {
-		//SQRexNode *greedystop = (node->next != -1) ? &exp->_nodes[node->next] : NULL;
-		SQRexNode *greedystop = NULL;
-		SQInteger p0 = (node->right >> 16)&0x0000FFFF, p1 = node->right&0x0000FFFF, nmaches = 0;
-		const SQChar *s=str, *good = str;
-
-		if(node->next != -1) {
-			greedystop = &exp->_nodes[node->next];
-		}
-		else {
-			greedystop = next;
-		}
-
-		while((nmaches == 0xFFFF || nmaches < p1)) {
-
-			const SQChar *stop;
-			if(!(s = sqstd_rex_matchnode(exp,&exp->_nodes[node->left],s,greedystop)))
-				break;
-			nmaches++;
-			good=s;
-			if(greedystop) {
-				//checks that 0 matches satisfy the expression(if so skips)
-				//if not would always stop(for instance if is a '?')
-				if(greedystop->type != OP_GREEDY ||
-				(greedystop->type == OP_GREEDY && ((greedystop->right >> 16)&0x0000FFFF) != 0))
-				{
-					SQRexNode *gnext = NULL;
-					if(greedystop->next != -1) {
-						gnext = &exp->_nodes[greedystop->next];
-					}else if(next && next->next != -1){
-						gnext = &exp->_nodes[next->next];
-					}
-					stop = sqstd_rex_matchnode(exp,greedystop,s,gnext);
-					if(stop) {
-						//if satisfied stop it
-						if(p0 == p1 && p0 == nmaches) break;
-						else if(nmaches >= p0 && p1 == 0xFFFF) break;
-						else if(nmaches >= p0 && nmaches <= p1) break;
-					}
-				}
-			}
-
-			if(s >= exp->_eol)
-				break;
-		}
-		if(p0 == p1 && p0 == nmaches) return good;
-		else if(nmaches >= p0 && p1 == 0xFFFF) return good;
-		else if(nmaches >= p0 && nmaches <= p1) return good;
-		return NULL;
-	}
-	case OP_OR: {
-			const SQChar *asd = str;
-			SQRexNode *temp=&exp->_nodes[node->left];
-			while( (asd = sqstd_rex_matchnode(exp,temp,asd,NULL)) ) {
-				if(temp->next != -1)
-					temp = &exp->_nodes[temp->next];
-				else
-					return asd;
-			}
-			asd = str;
-			temp = &exp->_nodes[node->right];
-			while( (asd = sqstd_rex_matchnode(exp,temp,asd,NULL)) ) {
-				if(temp->next != -1)
-					temp = &exp->_nodes[temp->next];
-				else
-					return asd;
-			}
-			return NULL;
-			break;
-	}
-	case OP_EXPR:
-	case OP_NOCAPEXPR:{
-			SQRexNode *n = &exp->_nodes[node->left];
-			const SQChar *cur = str;
-			SQInteger capture = -1;
-			if(node->type != OP_NOCAPEXPR && node->right == exp->_currsubexp) {
-				capture = exp->_currsubexp;
-				exp->_matches[capture].begin = cur;
-				exp->_currsubexp++;
-			}
-
-			do {
-				SQRexNode *subnext = NULL;
-				if(n->next != -1) {
-					subnext = &exp->_nodes[n->next];
-				}else {
-					subnext = next;
-				}
-				if(!(cur = sqstd_rex_matchnode(exp,n,cur,subnext))) {
-					if(capture != -1){
-						exp->_matches[capture].begin = 0;
-						exp->_matches[capture].len = 0;
-					}
-					return NULL;
-				}
-			} while((n->next != -1) && (n = &exp->_nodes[n->next]));
-
-			if(capture != -1)
-				exp->_matches[capture].len = cur - exp->_matches[capture].begin;
-			return cur;
-	}
-	case OP_WB:
-		if((str == exp->_bol && !isspace(*str))
-		 || (str == exp->_eol && !isspace(*(str-1)))
-		 || (!isspace(*str) && isspace(*(str+1)))
-		 || (isspace(*str) && !isspace(*(str+1))) ) {
-			return (node->left == 'b')?str:NULL;
-		}
-		return (node->left == 'b')?NULL:str;
-	case OP_BOL:
-		if(str == exp->_bol) return str;
-		return NULL;
-	case OP_EOL:
-		if(str == exp->_eol) return str;
-		return NULL;
-	case OP_DOT:{
-		*str++;
-				}
-		return str;
-	case OP_NCLASS:
-	case OP_CLASS:
-		if(sqstd_rex_matchclass(exp,&exp->_nodes[node->left],*str)?(type == OP_CLASS?SQTrue:SQFalse):(type == OP_NCLASS?SQTrue:SQFalse)) {
-			*str++;
-			return str;
-		}
-		return NULL;
-	case OP_CCLASS:
-		if(sqstd_rex_matchcclass(node->left,*str)) {
-			*str++;
-			return str;
-		}
-		return NULL;
-	default: /* char */
-		if(*str != (SQChar)node->type) return NULL;
-		*str++;
-		return str;
-	}
-	return NULL;
-}
-
-/* public api */
-SQRex *sqstd_rex_compile(const SQChar *pattern,const SQChar **error)
-{
-	SQRex *exp = (SQRex *)sq_malloc(sizeof(SQRex));
-	exp->_eol = exp->_bol = NULL;
-	exp->_p = pattern;
-	exp->_nallocated = (SQInteger)scstrlen(pattern) * sizeof(SQChar);
-	exp->_nodes = (SQRexNode *)sq_malloc(exp->_nallocated * sizeof(SQRexNode));
-	exp->_nsize = 0;
-	exp->_matches = 0;
-	exp->_nsubexpr = 0;
-	exp->_first = sqstd_rex_newnode(exp,OP_EXPR);
-	exp->_error = error;
-	try {
-		SQInteger res = sqstd_rex_list(exp);
-		exp->_nodes[exp->_first].left = res;
-		if(*exp->_p!='\0')
-			sqstd_rex_error(exp,_SC("unexpected character"));
-#ifdef _DEBUG
-		{
-			SQInteger nsize,i;
-			SQRexNode *t;
-			nsize = exp->_nsize;
-			t = &exp->_nodes[0];
-			scprintf(_SC("\n"));
-			/* XXX -- The (int) casts are needed to silent warnings on 64bit systems (SQInteger is 64bit, %d assumes 32bit, (int) is 32bit) */
-			for(i = 0;i < nsize; i++) {
-				if(exp->_nodes[i].type>MAX_CHAR)
-					scprintf(_SC("[%02d] %10s "),(int)i,g_nnames[exp->_nodes[i].type-MAX_CHAR]);
-				else
-					scprintf(_SC("[%02d] %10c "),(int)i,exp->_nodes[i].type);
-				scprintf(_SC("left %02d right %02d next %02d\n"),(int)exp->_nodes[i].left,(int)exp->_nodes[i].right,(int)exp->_nodes[i].next);
-			}
-			scprintf(_SC("\n"));
-		}
-#endif
-		exp->_matches = (SQRexMatch *) sq_malloc(exp->_nsubexpr * sizeof(SQRexMatch));
-		memset(exp->_matches,0,exp->_nsubexpr * sizeof(SQRexMatch));
-		return exp;
-	}
-	catch (...) {
-		sqstd_rex_free(exp);
-		return NULL;
-	}
-}
-
-void sqstd_rex_free(SQRex *exp)
-{
-	if(exp)	{
-		if(exp->_nodes) sq_free(exp->_nodes,exp->_nallocated * sizeof(SQRexNode));
-		if(exp->_matches) sq_free(exp->_matches,exp->_nsubexpr * sizeof(SQRexMatch));
-		sq_free(exp,sizeof(SQRex));
-	}
-}
-
-SQBool sqstd_rex_match(SQRex* exp,const SQChar* text)
-{
-	const SQChar* res = NULL;
-	exp->_bol = text;
-	exp->_eol = text + scstrlen(text);
-	exp->_currsubexp = 0;
-	res = sqstd_rex_matchnode(exp,exp->_nodes,text,NULL);
-	if(res == NULL || res != exp->_eol)
-		return SQFalse;
-	return SQTrue;
-}
-
-SQBool sqstd_rex_searchrange(SQRex* exp,const SQChar* text_begin,const SQChar* text_end,const SQChar** out_begin, const SQChar** out_end)
-{
-	const SQChar *cur = NULL;
-	SQInteger node = exp->_first;
-	if(text_begin >= text_end) return SQFalse;
-	exp->_bol = text_begin;
-	exp->_eol = text_end;
-	do {
-		cur = text_begin;
-		while(node != -1) {
-			exp->_currsubexp = 0;
-			cur = sqstd_rex_matchnode(exp,&exp->_nodes[node],cur,NULL);
-			if(!cur)
-				break;
-			node = exp->_nodes[node].next;
-		}
-		*text_begin++;
-	} while(cur == NULL && text_begin != text_end);
-
-	if(cur == NULL)
-		return SQFalse;
-
-	--text_begin;
-
-	if(out_begin) *out_begin = text_begin;
-	if(out_end) *out_end = cur;
-	return SQTrue;
-}
-
-SQBool sqstd_rex_search(SQRex* exp,const SQChar* text, const SQChar** out_begin, const SQChar** out_end)
-{
-	return sqstd_rex_searchrange(exp,text,text + scstrlen(text),out_begin,out_end);
-}
-
-SQInteger sqstd_rex_getsubexpcount(SQRex* exp)
-{
-	return exp->_nsubexpr;
-}
-
-SQBool sqstd_rex_getsubexp(SQRex* exp, SQInteger n, SQRexMatch *subexp)
-{
-	if( n<0 || n >= exp->_nsubexpr) return SQFalse;
-	*subexp = exp->_matches[n];
-	return SQTrue;
-}
-
@@ -1,330 +0,0 @@
-/* see copyright notice in squirrel.h */
-#include <stdio.h>
-#include <new>
-#include <stdlib.h>
-#include <string.h>
-#include <squirrel.h>
-#include <sqstdio.h>
-#include <sqstdblob.h>
-#include "sqstdstream.h"
-#include "sqstdblobimpl.h"
-
-#define SETUP_STREAM(v) \
-	SQStream *self = NULL; \
-	if(SQ_FAILED(sq_getinstanceup(v,1,(SQUserPointer*)&self,(SQUserPointer)SQSTD_STREAM_TYPE_TAG))) \
-		return sq_throwerror(v,_SC("invalid type tag")); \
-	if(!self->IsValid())  \
-		return sq_throwerror(v,_SC("the stream is invalid"));
-
-SQInteger _stream_readblob(HSQUIRRELVM v)
-{
-	SETUP_STREAM(v);
-	SQUserPointer data,blobp;
-	SQInteger size,res;
-	sq_getinteger(v,2,&size);
-	if(size > self->Len()) {
-		size = self->Len();
-	}
-	data = sq_getscratchpad(v,size);
-	res = self->Read(data,size);
-	if(res <= 0)
-		return sq_throwerror(v,_SC("no data left to read"));
-	blobp = sqstd_createblob(v,res);
-	memcpy(blobp,data,res);
-	return 1;
-}
-
-#define SAFE_READN(ptr,len) { \
-	if(self->Read(ptr,len) != len) return sq_throwerror(v,_SC("io error")); \
-	}
-SQInteger _stream_readn(HSQUIRRELVM v)
-{
-	SETUP_STREAM(v);
-	SQInteger format;
-	sq_getinteger(v, 2, &format);
-	switch(format) {
-	case 'l': {
-		SQInteger i;
-		SAFE_READN(&i, sizeof(i));
-		sq_pushinteger(v, i);
-			  }
-		break;
-	case 'i': {
-		SQInt32 i;
-		SAFE_READN(&i, sizeof(i));
-		sq_pushinteger(v, i);
-			  }
-		break;
-	case 's': {
-		short s;
-		SAFE_READN(&s, sizeof(short));
-		sq_pushinteger(v, s);
-			  }
-		break;
-	case 'w': {
-		unsigned short w;
-		SAFE_READN(&w, sizeof(unsigned short));
-		sq_pushinteger(v, w);
-			  }
-		break;
-	case 'c': {
-		char c;
-		SAFE_READN(&c, sizeof(char));
-		sq_pushinteger(v, c);
-			  }
-		break;
-	case 'b': {
-		unsigned char c;
-		SAFE_READN(&c, sizeof(unsigned char));
-		sq_pushinteger(v, c);
-			  }
-		break;
-	case 'f': {
-		float f;
-		SAFE_READN(&f, sizeof(float));
-		sq_pushfloat(v, f);
-			  }
-		break;
-	case 'd': {
-		double d;
-		SAFE_READN(&d, sizeof(double));
-		sq_pushfloat(v, (SQFloat)d);
-			  }
-		break;
-	default:
-		return sq_throwerror(v, _SC("invalid format"));
-	}
-	return 1;
-}
-
-SQInteger _stream_writeblob(HSQUIRRELVM v)
-{
-	SQUserPointer data;
-	SQInteger size;
-	SETUP_STREAM(v);
-	if(SQ_FAILED(sqstd_getblob(v,2,&data)))
-		return sq_throwerror(v,_SC("invalid parameter"));
-	size = sqstd_getblobsize(v,2);
-	if(self->Write(data,size) != size)
-		return sq_throwerror(v,_SC("io error"));
-	sq_pushinteger(v,size);
-	return 1;
-}
-
-SQInteger _stream_writen(HSQUIRRELVM v)
-{
-	SETUP_STREAM(v);
-	SQInteger format, ti;
-	SQFloat tf;
-	sq_getinteger(v, 3, &format);
-	switch(format) {
-	case 'l': {
-		SQInteger i;
-		sq_getinteger(v, 2, &ti);
-		i = ti;
-		self->Write(&i, sizeof(SQInteger));
-			  }
-		break;
-	case 'i': {
-		SQInt32 i;
-		sq_getinteger(v, 2, &ti);
-		i = (SQInt32)ti;
-		self->Write(&i, sizeof(SQInt32));
-			  }
-		break;
-	case 's': {
-		short s;
-		sq_getinteger(v, 2, &ti);
-		s = (short)ti;
-		self->Write(&s, sizeof(short));
-			  }
-		break;
-	case 'w': {
-		unsigned short w;
-		sq_getinteger(v, 2, &ti);
-		w = (unsigned short)ti;
-		self->Write(&w, sizeof(unsigned short));
-			  }
-		break;
-	case 'c': {
-		char c;
-		sq_getinteger(v, 2, &ti);
-		c = (char)ti;
-		self->Write(&c, sizeof(char));
-				  }
-		break;
-	case 'b': {
-		unsigned char b;
-		sq_getinteger(v, 2, &ti);
-		b = (unsigned char)ti;
-		self->Write(&b, sizeof(unsigned char));
-			  }
-		break;
-	case 'f': {
-		float f;
-		sq_getfloat(v, 2, &tf);
-		f = (float)tf;
-		self->Write(&f, sizeof(float));
-			  }
-		break;
-	case 'd': {
-		double d;
-		sq_getfloat(v, 2, &tf);
-		d = tf;
-		self->Write(&d, sizeof(double));
-			  }
-		break;
-	default:
-		return sq_throwerror(v, _SC("invalid format"));
-	}
-	return 0;
-}
-
-SQInteger _stream_seek(HSQUIRRELVM v)
-{
-	SETUP_STREAM(v);
-	SQInteger offset, origin = SQ_SEEK_SET;
-	sq_getinteger(v, 2, &offset);
-	if(sq_gettop(v) > 2) {
-		SQInteger t;
-		sq_getinteger(v, 3, &t);
-		switch(t) {
-			case 'b': origin = SQ_SEEK_SET; break;
-			case 'c': origin = SQ_SEEK_CUR; break;
-			case 'e': origin = SQ_SEEK_END; break;
-			default: return sq_throwerror(v,_SC("invalid origin"));
-		}
-	}
-	sq_pushinteger(v, self->Seek(offset, origin));
-	return 1;
-}
-
-SQInteger _stream_tell(HSQUIRRELVM v)
-{
-	SETUP_STREAM(v);
-	sq_pushinteger(v, self->Tell());
-	return 1;
-}
-
-SQInteger _stream_len(HSQUIRRELVM v)
-{
-	SETUP_STREAM(v);
-	sq_pushinteger(v, self->Len());
-	return 1;
-}
-
-SQInteger _stream_flush(HSQUIRRELVM v)
-{
-	SETUP_STREAM(v);
-	if(!self->Flush())
-		sq_pushinteger(v, 1);
-	else
-		sq_pushnull(v);
-	return 1;
-}
-
-SQInteger _stream_eos(HSQUIRRELVM v)
-{
-	SETUP_STREAM(v);
-	if(self->EOS())
-		sq_pushinteger(v, 1);
-	else
-		sq_pushnull(v);
-	return 1;
-}
-
-static SQRegFunction _stream_methods[] = {
-	_DECL_STREAM_FUNC(readblob,2,_SC("xn")),
-	_DECL_STREAM_FUNC(readn,2,_SC("xn")),
-	_DECL_STREAM_FUNC(writeblob,-2,_SC("xx")),
-	_DECL_STREAM_FUNC(writen,3,_SC("xnn")),
-	_DECL_STREAM_FUNC(seek,-2,_SC("xnn")),
-	_DECL_STREAM_FUNC(tell,1,_SC("x")),
-	_DECL_STREAM_FUNC(len,1,_SC("x")),
-	_DECL_STREAM_FUNC(eos,1,_SC("x")),
-	_DECL_STREAM_FUNC(flush,1,_SC("x")),
-	{0,0,0,0}
-};
-
-void init_streamclass(HSQUIRRELVM v)
-{
-	sq_pushregistrytable(v);
-	sq_pushstring(v,_SC("std_stream"),-1);
-	if(SQ_FAILED(sq_get(v,-2))) {
-		sq_pushstring(v,_SC("std_stream"),-1);
-		sq_newclass(v,SQFalse);
-		sq_settypetag(v,-1,(SQUserPointer)SQSTD_STREAM_TYPE_TAG);
-		SQInteger i = 0;
-		while(_stream_methods[i].name != 0) {
-			SQRegFunction &f = _stream_methods[i];
-			sq_pushstring(v,f.name,-1);
-			sq_newclosure(v,f.f,0);
-			sq_setparamscheck(v,f.nparamscheck,f.typemask);
-			sq_createslot(v,-3);
-			i++;
-		}
-		sq_createslot(v,-3);
-		sq_pushroottable(v);
-		sq_pushstring(v,_SC("stream"),-1);
-		sq_pushstring(v,_SC("std_stream"),-1);
-		sq_get(v,-4);
-		sq_createslot(v,-3);
-		sq_pop(v,1);
-	}
-	else {
-		sq_pop(v,1); //result
-	}
-	sq_pop(v,1);
-}
-
-SQRESULT declare_stream(HSQUIRRELVM v,const SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals)
-{
-	if(sq_gettype(v,-1) != OT_TABLE)
-		return sq_throwerror(v,_SC("table expected"));
-	SQInteger top = sq_gettop(v);
-	//create delegate
-    init_streamclass(v);
-	sq_pushregistrytable(v);
-	sq_pushstring(v,reg_name,-1);
-	sq_pushstring(v,_SC("std_stream"),-1);
-	if(SQ_SUCCEEDED(sq_get(v,-3))) {
-		sq_newclass(v,SQTrue);
-		sq_settypetag(v,-1,typetag);
-		SQInteger i = 0;
-		while(methods[i].name != 0) {
-			SQRegFunction &f = methods[i];
-			sq_pushstring(v,f.name,-1);
-			sq_newclosure(v,f.f,0);
-			sq_setparamscheck(v,f.nparamscheck,f.typemask);
-			sq_setnativeclosurename(v,-1,f.name);
-			sq_createslot(v,-3);
-			i++;
-		}
-		sq_createslot(v,-3);
-		sq_pop(v,1);
-
-		i = 0;
-		while(globals[i].name!=0)
-		{
-			SQRegFunction &f = globals[i];
-			sq_pushstring(v,f.name,-1);
-			sq_newclosure(v,f.f,0);
-			sq_setparamscheck(v,f.nparamscheck,f.typemask);
-			sq_setnativeclosurename(v,-1,f.name);
-			sq_createslot(v,-3);
-			i++;
-		}
-		//register the class in the target table
-		sq_pushstring(v,name,-1);
-		sq_pushregistrytable(v);
-		sq_pushstring(v,reg_name,-1);
-		sq_get(v,-2);
-		sq_remove(v,-2);
-		sq_createslot(v,-3);
-
-		sq_settop(v,top);
-		return SQ_OK;
-	}
-	sq_settop(v,top);
-	return SQ_ERROR;
-}
@@ -1,18 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQSTD_STREAM_H_
-#define _SQSTD_STREAM_H_
-
-SQInteger _stream_readblob(HSQUIRRELVM v);
-SQInteger _stream_readline(HSQUIRRELVM v);
-SQInteger _stream_readn(HSQUIRRELVM v);
-SQInteger _stream_writeblob(HSQUIRRELVM v);
-SQInteger _stream_writen(HSQUIRRELVM v);
-SQInteger _stream_seek(HSQUIRRELVM v);
-SQInteger _stream_tell(HSQUIRRELVM v);
-SQInteger _stream_len(HSQUIRRELVM v);
-SQInteger _stream_eos(HSQUIRRELVM v);
-SQInteger _stream_flush(HSQUIRRELVM v);
-
-#define _DECL_STREAM_FUNC(name,nparams,typecheck) {_SC(#name),_stream_##name,nparams,typecheck}
-SQRESULT declare_stream(HSQUIRRELVM v,const SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals);
-#endif /*_SQSTD_STREAM_H_*/
@@ -1,364 +0,0 @@
-/* see copyright notice in squirrel.h */
-#include <squirrel.h>
-#include <sqstdstring.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <assert.h>
-#include <stdarg.h>
-
-#ifdef SQUNICODE
-#define scstrchr wcschr
-#define scatoi _wtoi
-#define scstrtok wcstok
-#else
-#define scstrchr strchr
-#define scatoi atoi
-#define scstrtok strtok
-#endif
-#define MAX_FORMAT_LEN	20
-#define MAX_WFORMAT_LEN	3
-#define ADDITIONAL_FORMAT_SPACE (100*sizeof(SQChar))
-
-static SQInteger validate_format(HSQUIRRELVM v, SQChar *fmt, const SQChar *src, SQInteger n,SQInteger &width)
-{
-	SQChar swidth[MAX_WFORMAT_LEN];
-	SQInteger wc = 0;
-	SQInteger start = n;
-	fmt[0] = '%';
-	while (scstrchr(_SC("-+ #0"), src[n])) n++;
-	while (scisdigit(src[n])) {
-		swidth[wc] = src[n];
-		n++;
-		wc++;
-		if(wc>=MAX_WFORMAT_LEN)
-			return sq_throwerror(v,_SC("width format too long"));
-	}
-	swidth[wc] = '\0';
-	if(wc > 0) {
-		width = scatoi(swidth);
-	}
-	else
-		width = 0;
-	if (src[n] == '.') {
-	    n++;
-
-		wc = 0;
-		while (scisdigit(src[n])) {
-			swidth[wc] = src[n];
-			n++;
-			wc++;
-			if(wc>=MAX_WFORMAT_LEN)
-				return sq_throwerror(v,_SC("precision format too long"));
-		}
-		swidth[wc] = '\0';
-		if(wc > 0) {
-			width += scatoi(swidth);
-		}
-	}
-	if (n-start > MAX_FORMAT_LEN )
-		return sq_throwerror(v,_SC("format too long"));
-	memcpy(&fmt[1],&src[start],((n-start)+1)*sizeof(SQChar));
-	fmt[(n-start)+2] = '\0';
-	return n;
-}
-
-/*
- * Little hack to remove the "format not a string literal, argument types not checked" warning.
- * This check has been added to OpenTTD to make sure that nobody passes wrong string literals,
- * but three lines in Squirrel have a little problem with those. Therefor we use this hack
- * which basically uses vsnprintf instead of sprintf as vsnprintf is not testing for the right
- * string literal at compile time.
- */
-static void _append_string(SQInteger &i, SQChar *dest, SQInteger allocated, const SQChar *fmt, ...)
-{
-	va_list va;
-	va_start(va, fmt);
-	i += scvsnprintf(&dest[i],allocated-i,fmt,va);
-	va_end(va);
-}
-
-static SQInteger _string_format(HSQUIRRELVM v)
-{
-	const SQChar *format;
-	SQChar *dest;
-	SQChar fmt[MAX_FORMAT_LEN];
-	sq_getstring(v,2,&format);
-	SQInteger allocated = (sq_getsize(v,2)+1)*sizeof(SQChar);
-	dest = sq_getscratchpad(v,allocated);
-	SQInteger n = 0,i = 0, nparam = 3, w = 0;
-	while(format[n] != '\0') {
-		if(format[n] != '%') {
-			assert(i < allocated);
-			dest[i++] = format[n];
-			n++;
-		}
-		else if(format[n+1] == '%') { //handles %%
-				dest[i++] = '%';
-				n += 2;
-		}
-		else {
-			n++;
-			if( nparam > sq_gettop(v) )
-				return sq_throwerror(v,_SC("not enough paramters for the given format string"));
-			n = validate_format(v,fmt,format,n,w);
-			if(n < 0) return -1;
-			SQInteger addlen = 0;
-			SQInteger valtype = 0;
-			const SQChar *ts;
-			SQInteger ti;
-			SQFloat tf;
-			switch(format[n]) {
-			case 's':
-				if(SQ_FAILED(sq_getstring(v,nparam,&ts)))
-					return sq_throwerror(v,_SC("string expected for the specified format"));
-				addlen = (sq_getsize(v,nparam)*sizeof(SQChar))+((w+1)*sizeof(SQChar));
-				valtype = 's';
-				break;
-			case 'i': case 'd': case 'c':case 'o':  case 'u':  case 'x':  case 'X':
-				if(SQ_FAILED(sq_getinteger(v,nparam,&ti)))
-					return sq_throwerror(v,_SC("integer expected for the specified format"));
-				addlen = (ADDITIONAL_FORMAT_SPACE)+((w+1)*sizeof(SQChar));
-				valtype = 'i';
-				break;
-			case 'f': case 'g': case 'G': case 'e':  case 'E':
-				if(SQ_FAILED(sq_getfloat(v,nparam,&tf)))
-					return sq_throwerror(v,_SC("float expected for the specified format"));
-				addlen = (ADDITIONAL_FORMAT_SPACE)+((w+1)*sizeof(SQChar));
-				valtype = 'f';
-				break;
-			default:
-				return sq_throwerror(v,_SC("invalid format"));
-			}
-			n++;
-			allocated += addlen;
-			dest = sq_getscratchpad(v,allocated);
-			switch(valtype) {
-			case 's': _append_string(i,dest,allocated,fmt,ts); break;
-			case 'i': _append_string(i,dest,allocated,fmt,ti); break;
-			case 'f': _append_string(i,dest,allocated,fmt,tf); break;
-			};
-			nparam ++;
-		}
-	}
-	sq_pushstring(v,dest,i);
-	return 1;
-}
-
-static void __strip_l(const SQChar *str,const SQChar **start)
-{
-	const SQChar *t = str;
-	while(((*t) != '\0') && scisspace(*t)){ t++; }
-	*start = t;
-}
-
-static void __strip_r(const SQChar *str,SQInteger len,const SQChar **end)
-{
-	if(len == 0) {
-		*end = str;
-		return;
-	}
-	const SQChar *t = &str[len-1];
-	while(t != str && scisspace(*t)) { t--; }
-	*end = t+1;
-}
-
-static SQInteger _string_strip(HSQUIRRELVM v)
-{
-	const SQChar *str,*start,*end;
-	sq_getstring(v,2,&str);
-	SQInteger len = sq_getsize(v,2);
-	__strip_l(str,&start);
-	__strip_r(str,len,&end);
-	sq_pushstring(v,start,end - start);
-	return 1;
-}
-
-static SQInteger _string_lstrip(HSQUIRRELVM v)
-{
-	const SQChar *str,*start;
-	sq_getstring(v,2,&str);
-	__strip_l(str,&start);
-	sq_pushstring(v,start,-1);
-	return 1;
-}
-
-static SQInteger _string_rstrip(HSQUIRRELVM v)
-{
-	const SQChar *str,*end;
-	sq_getstring(v,2,&str);
-	SQInteger len = sq_getsize(v,2);
-	__strip_r(str,len,&end);
-	sq_pushstring(v,str,end - str);
-	return 1;
-}
-
-static SQInteger _string_split(HSQUIRRELVM v)
-{
-	const SQChar *str,*seps;
-	SQChar *stemp,*tok;
-	sq_getstring(v,2,&str);
-	sq_getstring(v,3,&seps);
-	if(sq_getsize(v,3) == 0) return sq_throwerror(v,_SC("empty separators string"));
-	SQInteger memsize = (sq_getsize(v,2)+1)*sizeof(SQChar);
-	stemp = sq_getscratchpad(v,memsize);
-	memcpy(stemp,str,memsize);
-	tok = scstrtok(stemp,seps);
-	sq_newarray(v,0);
-	while( tok != NULL ) {
-		sq_pushstring(v,tok,-1);
-		sq_arrayappend(v,-2);
-		tok = scstrtok( NULL, seps );
-	}
-	return 1;
-}
-
-#define SETUP_REX(v) \
-	SQRex *self = NULL; \
-	sq_getinstanceup(v,1,(SQUserPointer *)&self,0);
-
-static SQInteger _rexobj_releasehook(SQUserPointer p, SQInteger size)
-{
-	SQRex *self = ((SQRex *)p);
-	sqstd_rex_free(self);
-	return 1;
-}
-
-static SQInteger _regexp_match(HSQUIRRELVM v)
-{
-	SETUP_REX(v);
-	const SQChar *str;
-	sq_getstring(v,2,&str);
-	if(sqstd_rex_match(self,str) == SQTrue)
-	{
-		sq_pushbool(v,SQTrue);
-		return 1;
-	}
-	sq_pushbool(v,SQFalse);
-	return 1;
-}
-
-static void _addrexmatch(HSQUIRRELVM v,const SQChar *str,const SQChar *begin,const SQChar *end)
-{
-	sq_newtable(v);
-	sq_pushstring(v,_SC("begin"),-1);
-	sq_pushinteger(v,begin - str);
-	sq_rawset(v,-3);
-	sq_pushstring(v,_SC("end"),-1);
-	sq_pushinteger(v,end - str);
-	sq_rawset(v,-3);
-}
-
-static SQInteger _regexp_search(HSQUIRRELVM v)
-{
-	SETUP_REX(v);
-	const SQChar *str,*begin,*end;
-	SQInteger start = 0;
-	sq_getstring(v,2,&str);
-	if(sq_gettop(v) > 2) sq_getinteger(v,3,&start);
-	if(sqstd_rex_search(self,str+start,&begin,&end) == SQTrue) {
-		_addrexmatch(v,str,begin,end);
-		return 1;
-	}
-	return 0;
-}
-
-static SQInteger _regexp_capture(HSQUIRRELVM v)
-{
-	SETUP_REX(v);
-	const SQChar *str,*begin,*end;
-	SQInteger start = 0;
-	sq_getstring(v,2,&str);
-	if(sq_gettop(v) > 2) sq_getinteger(v,3,&start);
-	if(sqstd_rex_search(self,str+start,&begin,&end) == SQTrue) {
-		SQInteger n = sqstd_rex_getsubexpcount(self);
-		SQRexMatch match;
-		sq_newarray(v,0);
-		for(SQInteger i = 0;i < n; i++) {
-			sqstd_rex_getsubexp(self,i,&match);
-			if(match.len > 0)
-				_addrexmatch(v,str,match.begin,match.begin+match.len);
-			else
-				_addrexmatch(v,str,str,str); //empty match
-			sq_arrayappend(v,-2);
-		}
-		return 1;
-	}
-	return 0;
-}
-
-static SQInteger _regexp_subexpcount(HSQUIRRELVM v)
-{
-	SETUP_REX(v);
-	sq_pushinteger(v,sqstd_rex_getsubexpcount(self));
-	return 1;
-}
-
-static SQInteger _regexp_constructor(HSQUIRRELVM v)
-{
-	const SQChar *error,*pattern;
-	sq_getstring(v,2,&pattern);
-	SQRex *rex = sqstd_rex_compile(pattern,&error);
-	if(!rex) return sq_throwerror(v,error);
-	sq_setinstanceup(v,1,rex);
-	sq_setreleasehook(v,1,_rexobj_releasehook);
-	return 0;
-}
-
-static SQInteger _regexp__typeof(HSQUIRRELVM v)
-{
-	sq_pushstring(v,_SC("regexp"),-1);
-	return 1;
-}
-
-#define _DECL_REX_FUNC(name,nparams,pmask) {_SC(#name),_regexp_##name,nparams,pmask}
-static SQRegFunction rexobj_funcs[]={
-	_DECL_REX_FUNC(constructor,2,_SC(".s")),
-	_DECL_REX_FUNC(search,-2,_SC("xsn")),
-	_DECL_REX_FUNC(match,2,_SC("xs")),
-	_DECL_REX_FUNC(capture,-2,_SC("xsn")),
-	_DECL_REX_FUNC(subexpcount,1,_SC("x")),
-	_DECL_REX_FUNC(_typeof,1,_SC("x")),
-	{0,0,0,0}
-};
-
-#define _DECL_FUNC(name,nparams,pmask) {_SC(#name),_string_##name,nparams,pmask}
-static SQRegFunction stringlib_funcs[]={
-	_DECL_FUNC(format,-2,_SC(".s")),
-	_DECL_FUNC(strip,2,_SC(".s")),
-	_DECL_FUNC(lstrip,2,_SC(".s")),
-	_DECL_FUNC(rstrip,2,_SC(".s")),
-	_DECL_FUNC(split,3,_SC(".ss")),
-	{0,0,0,0}
-};
-
-
-SQInteger sqstd_register_stringlib(HSQUIRRELVM v)
-{
-	sq_pushstring(v,_SC("regexp"),-1);
-	sq_newclass(v,SQFalse);
-	SQInteger i = 0;
-	while(rexobj_funcs[i].name != 0) {
-		SQRegFunction &f = rexobj_funcs[i];
-		sq_pushstring(v,f.name,-1);
-		sq_newclosure(v,f.f,0);
-		sq_setparamscheck(v,f.nparamscheck,f.typemask);
-		sq_setnativeclosurename(v,-1,f.name);
-		sq_createslot(v,-3);
-		i++;
-	}
-	sq_createslot(v,-3);
-
-	i = 0;
-	while(stringlib_funcs[i].name!=0)
-	{
-		sq_pushstring(v,stringlib_funcs[i].name,-1);
-		sq_newclosure(v,stringlib_funcs[i].f,0);
-		sq_setparamscheck(v,stringlib_funcs[i].nparamscheck,stringlib_funcs[i].typemask);
-		sq_setnativeclosurename(v,-1,stringlib_funcs[i].name);
-		sq_createslot(v,-3);
-		i++;
-	}
-	return 1;
-}
@@ -1,147 +0,0 @@
-/* see copyright notice in squirrel.h */
-#include <squirrel.h>
-#include <time.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sqstdsystem.h>
-
-#ifdef SQUNICODE
-#include <wchar.h>
-#define scgetenv _wgetenv
-#define scsystem _wsystem
-#define scasctime _wasctime
-#define scremove _wremove
-#define screname _wrename
-#else
-#define scgetenv getenv
-#define scsystem system
-#define scasctime asctime
-#define scremove remove
-#define screname rename
-#endif
-
-static SQInteger _system_getenv(HSQUIRRELVM v)
-{
-	const SQChar *s;
-	if(SQ_SUCCEEDED(sq_getstring(v,2,&s))){
-        sq_pushstring(v,scgetenv(s),-1);
-		return 1;
-	}
-	return 0;
-}
-
-
-static SQInteger _system_system(HSQUIRRELVM v)
-{
-	const SQChar *s;
-	if(SQ_SUCCEEDED(sq_getstring(v,2,&s))){
-		sq_pushinteger(v,scsystem(s));
-		return 1;
-	}
-	return sq_throwerror(v,_SC("wrong param"));
-}
-
-
-static SQInteger _system_clock(HSQUIRRELVM v)
-{
-	sq_pushfloat(v,((SQFloat)clock())/(SQFloat)CLOCKS_PER_SEC);
-	return 1;
-}
-
-static SQInteger _system_time(HSQUIRRELVM v)
-{
-	time_t t;
-	time(&t);
-	sq_pushinteger(v,*((SQInteger *)&t));
-	return 1;
-}
-
-static SQInteger _system_remove(HSQUIRRELVM v)
-{
-	const SQChar *s;
-	sq_getstring(v,2,&s);
-	if(scremove(s)==-1)
-		return sq_throwerror(v,_SC("remove() failed"));
-	return 0;
-}
-
-static SQInteger _system_rename(HSQUIRRELVM v)
-{
-	const SQChar *oldn,*newn;
-	sq_getstring(v,2,&oldn);
-	sq_getstring(v,3,&newn);
-	if(screname(oldn,newn)==-1)
-		return sq_throwerror(v,_SC("rename() failed"));
-	return 0;
-}
-
-static void _set_integer_slot(HSQUIRRELVM v,const SQChar *name,SQInteger val)
-{
-	sq_pushstring(v,name,-1);
-	sq_pushinteger(v,val);
-	sq_rawset(v,-3);
-}
-
-static SQInteger _system_date(HSQUIRRELVM v)
-{
-	time_t t;
-	SQInteger it;
-	SQInteger format = 'l';
-	if(sq_gettop(v) > 1) {
-		sq_getinteger(v,2,&it);
-		t = it;
-		if(sq_gettop(v) > 2) {
-			sq_getinteger(v,3,(SQInteger*)&format);
-		}
-	}
-	else {
-		time(&t);
-	}
-	tm *date;
-    if(format == 'u')
-		date = gmtime(&t);
-	else
-		date = localtime(&t);
-	if(!date)
-		return sq_throwerror(v,_SC("crt api failure"));
-	sq_newtable(v);
-	_set_integer_slot(v, _SC("sec"), date->tm_sec);
-    _set_integer_slot(v, _SC("min"), date->tm_min);
-    _set_integer_slot(v, _SC("hour"), date->tm_hour);
-    _set_integer_slot(v, _SC("day"), date->tm_mday);
-    _set_integer_slot(v, _SC("month"), date->tm_mon);
-    _set_integer_slot(v, _SC("year"), date->tm_year+1900);
-    _set_integer_slot(v, _SC("wday"), date->tm_wday);
-    _set_integer_slot(v, _SC("yday"), date->tm_yday);
-	return 1;
-}
-
-
-
-#define _DECL_FUNC(name,nparams,pmask) {_SC(#name),_system_##name,nparams,pmask}
-static SQRegFunction systemlib_funcs[]={
-	_DECL_FUNC(getenv,2,_SC(".s")),
-	_DECL_FUNC(system,2,_SC(".s")),
-	_DECL_FUNC(clock,1,NULL),
-	_DECL_FUNC(time,1,NULL),
-	_DECL_FUNC(date,-1,_SC(".nn")),
-	_DECL_FUNC(remove,2,_SC(".s")),
-	_DECL_FUNC(rename,3,_SC(".ss")),
-	{0,0,0,0}
-};
-
-
-SQInteger sqstd_register_systemlib(HSQUIRRELVM v)
-{
-	SQInteger i=0;
-	while(systemlib_funcs[i].name!=0)
-	{
-		sq_pushstring(v,systemlib_funcs[i].name,-1);
-		sq_newclosure(v,systemlib_funcs[i].f,0);
-		sq_setparamscheck(v,systemlib_funcs[i].nparamscheck,systemlib_funcs[i].typemask);
-		sq_setnativeclosurename(v,-1,systemlib_funcs[i].name);
-		sq_createslot(v,-3);
-		i++;
-	}
-	return 1;
-}
@@ -1,77 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "sq"=.\sq\sq.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    .
-    end source code control
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name sqlibs
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name squirrel
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name sqstdlib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "sqstdlib"=.\sqstdlib\sqstdlib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    "$/squirrel", HAAAAAAA
-    .
-    end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "squirrel"=.\squirrel\squirrel.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-    begin source code control
-    "$/squirrel", HAAAAAAA
-    .
-    end source code control
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-    begin source code control
-    "$/squirrel", HAAAAAAA
-    .
-    end source code control
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
@@ -1,52 +0,0 @@
-SQUIRREL= ..
-
-
-OUT= $(SQUIRREL)/lib/libsquirrel.a
-INCZ= -I$(SQUIRREL)/include -I. -Iinclude
-DEFS=
-LIB=
-
-OBJS= \
-	sqapi.o \
-	sqbaselib.o \
-	sqcompiler.o \
-	sqdebug.o \
-	sqlexer.o \
-	sqobject.o \
-	sqparser.o \
-	sqstate.o \
-	sqtable.o \
-	sqvm.o \
-	sqmem.o \
-	sqclass.o
-
-SRCS= \
-	sqapi.cpp \
-	sqbaselib.cpp \
-	sqfuncstate.cpp \
-	sqdebug.cpp \
-	sqlexer.cpp \
-	sqobject.cpp \
-	sqcompiler.cpp \
-	sqstate.cpp \
-	sqtable.cpp \
-	sqmem.cpp \
-	sqvm.cpp \
-	sqclass.cpp
-
-
-
-sq32:
-	gcc -O2  -fno-rtti -Wall -c $(SRCS) $(INCZ) $(DEFS)
-	ar rc $(OUT) *.o
-
-sqprof:
-	gcc -O2 -pg -fno-rtti -pie -gstabs -g3 -Wall -c $(SRCS) $(INCZ) $(DEFS)
-	ar rc $(OUT) *.o
-
-sq64:
-	gcc -O2  -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ) $(DEFS)
-	ar rc $(OUT) *.o
-
-clean:
-	rm -f $(OUT) $(SRCS:%.cpp=%.o)
@@ -1,87 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQARRAY_H_
-#define _SQARRAY_H_
-
-struct SQArray : public CHAINABLE_OBJ
-{
-private:
-	SQArray(SQSharedState *ss,SQInteger nsize){_values.resize(nsize); INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this);}
-	~SQArray()
-	{
-		REMOVE_FROM_CHAIN(&_ss(this)->_gc_chain,this);
-	}
-public:
-	static SQArray* Create(SQSharedState *ss,SQInteger nInitialSize){
-		SQArray *newarray=(SQArray*)SQ_MALLOC(sizeof(SQArray));
-		new (newarray) SQArray(ss,nInitialSize);
-		return newarray;
-	}
-#ifndef NO_GARBAGE_COLLECTOR
-	void Mark(SQCollectable **chain);
-#endif
-	void Finalize(){
-		_values.resize(0);
-	}
-	bool Get(const SQInteger nidx,SQObjectPtr &val)
-	{
-		if(nidx>=0 && nidx<(SQInteger)_values.size()){
-			SQObjectPtr &o = _values[nidx];
-			val = _realval(o);
-			return true;
-		}
-		else return false;
-	}
-	bool Set(const SQInteger nidx,const SQObjectPtr &val)
-	{
-		if(nidx>=0 && nidx<(SQInteger)_values.size()){
-			_values[nidx]=val;
-			return true;
-		}
-		else return false;
-	}
-	SQInteger Next(const SQObjectPtr &refpos,SQObjectPtr &outkey,SQObjectPtr &outval)
-	{
-		SQUnsignedInteger idx=TranslateIndex(refpos);
-		while(idx<_values.size()){
-			//first found
-			outkey=(SQInteger)idx;
-			SQObjectPtr &o = _values[idx];
-			outval = _realval(o);
-			//return idx for the next iteration
-			return ++idx;
-		}
-		//nothing to iterate anymore
-		return -1;
-	}
-	SQArray *Clone(){SQArray *anew=Create(_opt_ss(this),Size()); anew->_values.copy(_values); return anew; }
-	SQInteger Size() const {return _values.size();}
-	void Resize(SQInteger size,SQObjectPtr &fill = _null_) { _values.resize(size,fill); ShrinkIfNeeded(); }
-	void Reserve(SQInteger size) { _values.reserve(size); }
-	void Append(const SQObject &o){_values.push_back(o);}
-	void Extend(const SQArray *a);
-	SQObjectPtr &Top(){return _values.top();}
-	void Pop(){_values.pop_back(); ShrinkIfNeeded(); }
-	bool Insert(SQInteger idx,const SQObject &val){
-		if(idx < 0 || idx > (SQInteger)_values.size())
-			return false;
-		_values.insert(idx,val);
-		return true;
-	}
-	void ShrinkIfNeeded() {
-		if(_values.size() <= _values.capacity()>>2) //shrink the array
-			_values.shrinktofit();
-	}
-	bool Remove(SQInteger idx){
-		if(idx < 0 || idx >= (SQInteger)_values.size())
-			return false;
-		_values.remove(idx);
-		ShrinkIfNeeded();
-		return true;
-	}
-	void Release()
-	{
-		sq_delete(this,SQArray);
-	}
-	SQObjectPtrVec _values;
-};
-#endif //_SQARRAY_H_
@@ -1,921 +0,0 @@
-/*
-	see copyright notice in squirrel.h
-*/
-#include "sqpcheader.h"
-#include "sqvm.h"
-#include "sqstring.h"
-#include "sqtable.h"
-#include "sqarray.h"
-#include "sqfuncproto.h"
-#include "sqclosure.h"
-#include "sqclass.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <ctype.h>
-
-bool str2num(const SQChar *s,SQObjectPtr &res)
-{
-	SQChar *end;
-	if(scstrstr(s,_SC("."))){
-		SQFloat r = SQFloat(scstrtod(s,&end));
-		if(s == end) return false;
-		res = r;
-		return true;
-	}
-	else{
-		SQInteger r = SQInteger(scstrtol(s,&end,10));
-		if(s == end) return false;
-		res = r;
-		return true;
-	}
-}
-
-#ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
-static SQInteger base_dummy(HSQUIRRELVM v)
-{
-	return 0;
-}
-
-#ifndef NO_GARBAGE_COLLECTOR
-static SQInteger base_collectgarbage(HSQUIRRELVM v)
-{
-	sq_pushinteger(v, sq_collectgarbage(v));
-	return 1;
-}
-#endif
-
-static SQInteger base_getroottable(HSQUIRRELVM v)
-{
-	v->Push(v->_roottable);
-	return 1;
-}
-
-static SQInteger base_getconsttable(HSQUIRRELVM v)
-{
-	v->Push(_ss(v)->_consts);
-	return 1;
-}
-
-
-static SQInteger base_setroottable(HSQUIRRELVM v)
-{
-	SQObjectPtr &o=stack_get(v,2);
-	if(SQ_FAILED(sq_setroottable(v))) return SQ_ERROR;
-	v->Push(o);
-	return 1;
-}
-
-static SQInteger base_setconsttable(HSQUIRRELVM v)
-{
-	SQObjectPtr &o=stack_get(v,2);
-	if(SQ_FAILED(sq_setconsttable(v))) return SQ_ERROR;
-	v->Push(o);
-	return 1;
-}
-
-static SQInteger base_seterrorhandler(HSQUIRRELVM v)
-{
-	sq_seterrorhandler(v);
-	return 0;
-}
-
-static SQInteger base_setdebughook(HSQUIRRELVM v)
-{
-	sq_setdebughook(v);
-	return 0;
-}
-
-static SQInteger base_enabledebuginfo(HSQUIRRELVM v)
-{
-	SQObjectPtr &o=stack_get(v,2);
-	sq_enabledebuginfo(v,(type(o) != OT_NULL)?1:0);
-	return 0;
-}
-
-static SQInteger base_getstackinfos(HSQUIRRELVM v)
-{
-	SQInteger level;
-	SQStackInfos si;
-	SQInteger seq = 0;
-	const SQChar *name = NULL;
-	sq_getinteger(v, -1, &level);
-	if (SQ_SUCCEEDED(sq_stackinfos(v, level, &si)))
-	{
-		const SQChar *fn = _SC("unknown");
-		const SQChar *src = _SC("unknown");
-		if(si.funcname)fn = si.funcname;
-		if(si.source)src = si.source;
-		sq_newtable(v);
-		sq_pushstring(v, _SC("func"), -1);
-		sq_pushstring(v, fn, -1);
-		sq_createslot(v, -3);
-		sq_pushstring(v, _SC("src"), -1);
-		sq_pushstring(v, src, -1);
-		sq_createslot(v, -3);
-		sq_pushstring(v, _SC("line"), -1);
-		sq_pushinteger(v, si.line);
-		sq_createslot(v, -3);
-		sq_pushstring(v, _SC("locals"), -1);
-		sq_newtable(v);
-		seq=0;
-		while ((name = sq_getlocal(v, level, seq))) {
-			sq_pushstring(v, name, -1);
-			sq_push(v, -2);
-			sq_createslot(v, -4);
-			sq_pop(v, 1);
-			seq++;
-		}
-		sq_createslot(v, -3);
-		return 1;
-	}
-
-	return 0;
-}
-#endif /* EXPORT_DEFAULT_SQUIRREL_FUNCTIONS */
-
-static SQInteger base_assert(HSQUIRRELVM v)
-{
-	if(v->IsFalse(stack_get(v,2))){
-		return sq_throwerror(v,_SC("assertion failed"));
-	}
-	return 0;
-}
-
-static SQInteger get_slice_params(HSQUIRRELVM v,SQInteger &sidx,SQInteger &eidx,SQObjectPtr &o)
-{
-	SQInteger top = sq_gettop(v);
-	sidx=0;
-	eidx=0;
-	o=stack_get(v,1);
-	SQObjectPtr &start=stack_get(v,2);
-	if(type(start)!=OT_NULL && sq_isnumeric(start)){
-		sidx=tointeger(start);
-	}
-	if(top>2){
-		SQObjectPtr &end=stack_get(v,3);
-		if(sq_isnumeric(end)){
-			eidx=tointeger(end);
-		}
-	}
-	else {
-		eidx = sq_getsize(v,1);
-	}
-	return 1;
-}
-
-static SQInteger base_print(HSQUIRRELVM v)
-{
-	const SQChar *str;
-	sq_tostring(v,2);
-	sq_getstring(v,-1,&str);
-	if(_ss(v)->_printfunc) _ss(v)->_printfunc(v,_SC("%s"),str);
-	return 0;
-}
-
-#ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
-static SQInteger base_compilestring(HSQUIRRELVM v)
-{
-	SQInteger nargs=sq_gettop(v);
-	const SQChar *src=NULL,*name=_SC("unnamedbuffer");
-	SQInteger size;
-	sq_getstring(v,2,&src);
-	size=sq_getsize(v,2);
-	if(nargs>2){
-		sq_getstring(v,3,&name);
-	}
-	if(SQ_SUCCEEDED(sq_compilebuffer(v,src,size,name,SQFalse)))
-		return 1;
-	else
-		return SQ_ERROR;
-}
-
-static SQInteger base_newthread(HSQUIRRELVM v)
-{
-	SQObjectPtr &func = stack_get(v,2);
-	SQInteger stksize = (_funcproto(_closure(func)->_function)->_stacksize << 1) +2;
-	HSQUIRRELVM newv = sq_newthread(v, (stksize < MIN_STACK_OVERHEAD + 2)? MIN_STACK_OVERHEAD + 2 : stksize);
-	sq_move(newv,v,-2);
-	return 1;
-}
-
-static SQInteger base_suspend(HSQUIRRELVM v)
-{
-	return sq_suspendvm(v);
-}
-#endif /* EXPORT_DEFAULT_SQUIRREL_FUNCTIONS */
-
-static SQInteger base_array(HSQUIRRELVM v)
-{
-	SQArray *a;
-	SQObject &size = stack_get(v,2);
-	if(sq_gettop(v) > 2) {
-		a = SQArray::Create(_ss(v),0);
-		a->Resize(tointeger(size),stack_get(v,3));
-	}
-	else {
-		a = SQArray::Create(_ss(v),tointeger(size));
-	}
-	v->Push(a);
-	return 1;
-}
-
-static SQInteger base_type(HSQUIRRELVM v)
-{
-	SQObjectPtr &o = stack_get(v,2);
-	v->Push(SQString::Create(_ss(v),GetTypeName(o),-1));
-	return 1;
-}
-
-static SQRegFunction base_funcs[]={
-	//generic
-#ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
-	{_SC("seterrorhandler"),base_seterrorhandler,2, NULL},
-	{_SC("setdebughook"),base_setdebughook,2, NULL},
-	{_SC("enabledebuginfo"),base_enabledebuginfo,2, NULL},
-	{_SC("getstackinfos"),base_getstackinfos,2, _SC(".n")},
-	{_SC("getroottable"),base_getroottable,1, NULL},
-	{_SC("setroottable"),base_setroottable,2, NULL},
-	{_SC("getconsttable"),base_getconsttable,1, NULL},
-	{_SC("setconsttable"),base_setconsttable,2, NULL},
-#endif
-	{_SC("assert"),base_assert,2, NULL},
-	{_SC("print"),base_print,2, NULL},
-#ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
-	{_SC("compilestring"),base_compilestring,-2, _SC(".ss")},
-	{_SC("newthread"),base_newthread,2, _SC(".c")},
-	{_SC("suspend"),base_suspend,-1, NULL},
-#endif
-	{_SC("array"),base_array,-2, _SC(".n")},
-	{_SC("type"),base_type,2, NULL},
-#ifdef EXPORT_DEFAULT_SQUIRREL_FUNCTIONS
-	{_SC("dummy"),base_dummy,0,NULL},
-#ifndef NO_GARBAGE_COLLECTOR
-	{_SC("collectgarbage"),base_collectgarbage,1, _SC("t")},
-#endif
-#endif
-	{0,0,0,0}
-};
-
-void sq_base_register(HSQUIRRELVM v)
-{
-	SQInteger i=0;
-	sq_pushroottable(v);
-	while(base_funcs[i].name!=0) {
-		sq_pushstring(v,base_funcs[i].name,-1);
-		sq_newclosure(v,base_funcs[i].f,0);
-		sq_setnativeclosurename(v,-1,base_funcs[i].name);
-		sq_setparamscheck(v,base_funcs[i].nparamscheck,base_funcs[i].typemask);
-		sq_createslot(v,-3);
-		i++;
-	}
-	sq_pushstring(v,_SC("_version_"),-1);
-	sq_pushstring(v,SQUIRREL_VERSION,-1);
-	sq_createslot(v,-3);
-	sq_pushstring(v,_SC("_charsize_"),-1);
-	sq_pushinteger(v,sizeof(SQChar));
-	sq_createslot(v,-3);
-	sq_pushstring(v,_SC("_intsize_"),-1);
-	sq_pushinteger(v,sizeof(SQInteger));
-	sq_createslot(v,-3);
-	sq_pop(v,1);
-}
-
-static SQInteger default_delegate_len(HSQUIRRELVM v)
-{
-	v->Push(SQInteger(sq_getsize(v,1)));
-	return 1;
-}
-
-static SQInteger default_delegate_tofloat(HSQUIRRELVM v)
-{
-	SQObjectPtr &o=stack_get(v,1);
-	switch(type(o)){
-	case OT_STRING:{
-		SQObjectPtr res;
-		if(str2num(_stringval(o),res)){
-			v->Push(SQObjectPtr(tofloat(res)));
-			break;
-		}}
-		return sq_throwerror(v, _SC("cannot convert the string"));
-		break;
-	case OT_INTEGER:case OT_FLOAT:
-		v->Push(SQObjectPtr(tofloat(o)));
-		break;
-	case OT_BOOL:
-		v->Push(SQObjectPtr((SQFloat)(_integer(o)?1:0)));
-		break;
-	default:
-		v->Push(_null_);
-		break;
-	}
-	return 1;
-}
-
-static SQInteger default_delegate_tointeger(HSQUIRRELVM v)
-{
-	SQObjectPtr &o=stack_get(v,1);
-	switch(type(o)){
-	case OT_STRING:{
-		SQObjectPtr res;
-		if(str2num(_stringval(o),res)){
-			v->Push(SQObjectPtr(tointeger(res)));
-			break;
-		}}
-		return sq_throwerror(v, _SC("cannot convert the string"));
-		break;
-	case OT_INTEGER:case OT_FLOAT:
-		v->Push(SQObjectPtr(tointeger(o)));
-		break;
-	case OT_BOOL:
-		v->Push(SQObjectPtr(_integer(o)?(SQInteger)1:(SQInteger)0));
-		break;
-	default:
-		v->Push(_null_);
-		break;
-	}
-	return 1;
-}
-
-static SQInteger default_delegate_tostring(HSQUIRRELVM v)
-{
-	sq_tostring(v,1);
-	return 1;
-}
-
-static SQInteger obj_delegate_weakref(HSQUIRRELVM v)
-{
-	sq_weakref(v,1);
-	return 1;
-}
-
-static SQInteger obj_clear(HSQUIRRELVM v)
-{
-	return sq_clear(v,-1);
-}
-
-
-static SQInteger number_delegate_tochar(HSQUIRRELVM v)
-{
-	SQObject &o=stack_get(v,1);
-	SQChar c = (SQChar)tointeger(o);
-	v->Push(SQString::Create(_ss(v),(const SQChar *)&c,1));
-	return 1;
-}
-
-
-/////////////////////////////////////////////////////////////////
-//TABLE DEFAULT DELEGATE
-
-static SQInteger table_rawdelete(HSQUIRRELVM v)
-{
-	if(SQ_FAILED(sq_rawdeleteslot(v,1,SQTrue)))
-		return SQ_ERROR;
-	return 1;
-}
-
-
-static SQInteger container_rawexists(HSQUIRRELVM v)
-{
-	if(SQ_SUCCEEDED(sq_rawget(v,-2))) {
-		sq_pushbool(v,SQTrue);
-		return 1;
-	}
-	sq_pushbool(v,SQFalse);
-	return 1;
-}
-
-static SQInteger table_rawset(HSQUIRRELVM v)
-{
-	return sq_rawset(v,-3);
-}
-
-
-static SQInteger table_rawget(HSQUIRRELVM v)
-{
-	return SQ_SUCCEEDED(sq_rawget(v,-2))?1:SQ_ERROR;
-}
-
-
-SQRegFunction SQSharedState::_table_default_delegate_funcz[]={
-	{_SC("len"),default_delegate_len,1, _SC("t")},
-	{_SC("rawget"),table_rawget,2, _SC("t")},
-	{_SC("rawset"),table_rawset,3, _SC("t")},
-	{_SC("rawdelete"),table_rawdelete,2, _SC("t")},
-	{_SC("rawin"),container_rawexists,2, _SC("t")},
-	{_SC("weakref"),obj_delegate_weakref,1, NULL },
-	{_SC("tostring"),default_delegate_tostring,1, _SC(".")},
-	{_SC("clear"),obj_clear,1, _SC(".")},
-	{0,0,0,0}
-};
-
-//ARRAY DEFAULT DELEGATE///////////////////////////////////////
-
-static SQInteger array_append(HSQUIRRELVM v)
-{
-	return sq_arrayappend(v,-2);
-}
-
-static SQInteger array_extend(HSQUIRRELVM v)
-{
-	_array(stack_get(v,1))->Extend(_array(stack_get(v,2)));
-	return 0;
-}
-
-static SQInteger array_reverse(HSQUIRRELVM v)
-{
-	return sq_arrayreverse(v,-1);
-}
-
-static SQInteger array_pop(HSQUIRRELVM v)
-{
-	return SQ_SUCCEEDED(sq_arraypop(v,1,SQTrue))?1:SQ_ERROR;
-}
-
-static SQInteger array_top(HSQUIRRELVM v)
-{
-	SQObject &o=stack_get(v,1);
-	if(_array(o)->Size()>0){
-		v->Push(_array(o)->Top());
-		return 1;
-	}
-	else return sq_throwerror(v,_SC("top() on a empty array"));
-}
-
-static SQInteger array_insert(HSQUIRRELVM v)
-{
-	SQObject &o=stack_get(v,1);
-	SQObject &idx=stack_get(v,2);
-	SQObject &val=stack_get(v,3);
-	if(!_array(o)->Insert(tointeger(idx),val))
-		return sq_throwerror(v,_SC("index out of range"));
-	return 0;
-}
-
-static SQInteger array_remove(HSQUIRRELVM v)
-{
-	SQObject &o = stack_get(v, 1);
-	SQObject &idx = stack_get(v, 2);
-	if(!sq_isnumeric(idx)) return sq_throwerror(v, _SC("wrong type"));
-	SQObjectPtr val;
-	if(_array(o)->Get(tointeger(idx), val)) {
-		_array(o)->Remove(tointeger(idx));
-		v->Push(val);
-		return 1;
-	}
-	return sq_throwerror(v, _SC("idx out of range"));
-}
-
-static SQInteger array_resize(HSQUIRRELVM v)
-{
-	SQObject &o = stack_get(v, 1);
-	SQObject &nsize = stack_get(v, 2);
-	SQObjectPtr fill;
-	if(sq_isnumeric(nsize)) {
-		if(sq_gettop(v) > 2)
-			fill = stack_get(v, 3);
-		_array(o)->Resize(tointeger(nsize),fill);
-		return 0;
-	}
-	return sq_throwerror(v, _SC("size must be a number"));
-}
-
-
-//QSORT ala Sedgewick
-bool _qsort_compare(HSQUIRRELVM v,SQObjectPtr &arr,SQObjectPtr &a,SQObjectPtr &b,SQInteger func,SQInteger &ret)
-{
-	if(func < 0) {
-		if(!v->ObjCmp(a,b,ret)) return false;
-	}
-	else {
-		SQInteger top = sq_gettop(v);
-		sq_push(v, func);
-		sq_pushroottable(v);
-		v->Push(a);
-		v->Push(b);
-		if(SQ_FAILED(sq_call(v, 3, SQTrue, SQFalse))) {
-			if(!sq_isstring( v->_lasterror))
-				v->Raise_Error(_SC("compare func failed"));
-			return false;
-		}
-		sq_getinteger(v, -1, &ret);
-		sq_settop(v, top);
-		return true;
-	}
-	return true;
-}
-//QSORT ala Sedgewick
-bool _qsort(HSQUIRRELVM v,SQObjectPtr &arr, SQInteger l, SQInteger r,SQInteger func)
-{
-	SQInteger i, j;
-	SQArray *a=_array(arr);
-	SQObjectPtr pivot,t;
-	if( l < r ){
-		pivot = a->_values[l];
-		i = l; j = r+1;
-		while(1){
-			SQInteger ret;
-			do {
-				++i;
-				if(i > r) break;
-				if(!_qsort_compare(v,arr,a->_values[i],pivot,func,ret))
-					return false;
-			} while( ret <= 0);
-			do {
-				--j;
-				if ( j < 0 ) {
-					v->Raise_Error( _SC("Invalid qsort, probably compare function defect") );
-					return false;
-				}
-				if(!_qsort_compare(v,arr,a->_values[j],pivot,func,ret))
-					return false;
-			}
-			while( ret > 0 );
-			if( i >= j ) break;
-			t = a->_values[i]; a->_values[i] = a->_values[j]; a->_values[j] = t;
-		}
-		t = a->_values[l]; a->_values[l] = a->_values[j]; a->_values[j] = t;
-		if(!_qsort( v, arr, l, j-1,func)) return false;
-		if(!_qsort( v, arr, j+1, r,func)) return false;
-	}
-	return true;
-}
-
-static SQInteger array_sort(HSQUIRRELVM v)
-{
-	SQInteger func = -1;
-	SQObjectPtr &o = stack_get(v,1);
-	SQObject &funcobj = stack_get(v,2);
-	if(_array(o)->Size() > 1) {
-		if(type(funcobj) == OT_CLOSURE || type(funcobj) == OT_NATIVECLOSURE) func = 2;
-		if(!_qsort(v, o, 0, _array(o)->Size()-1, func))
-			return SQ_ERROR;
-
-	}
-	return 0;
-}
-static SQInteger array_slice(HSQUIRRELVM v)
-{
-	SQInteger sidx,eidx;
-	SQObjectPtr o;
-	if(get_slice_params(v,sidx,eidx,o)==-1)return -1;
-	SQInteger alen = _array(o)->Size();
-	if(sidx < 0)sidx = alen + sidx;
-	if(eidx < 0)eidx = alen + eidx;
-	if(eidx < sidx)return sq_throwerror(v,_SC("wrong indexes"));
-	if(eidx > alen)return sq_throwerror(v,_SC("slice out of range"));
-	SQArray *arr=SQArray::Create(_ss(v),eidx-sidx);
-	SQObjectPtr t;
-	SQInteger count=0;
-	for(SQInteger i=sidx;i<eidx;i++){
-		_array(o)->Get(i,t);
-		arr->Set(count++,t);
-	}
-	v->Push(arr);
-	return 1;
-
-}
-
-SQRegFunction SQSharedState::_array_default_delegate_funcz[]={
-	{_SC("len"),default_delegate_len,1, _SC("a")},
-	{_SC("append"),array_append,2, _SC("a")},
-	{_SC("extend"),array_extend,2, _SC("aa")},
-	{_SC("push"),array_append,2, _SC("a")},
-	{_SC("pop"),array_pop,1, _SC("a")},
-	{_SC("top"),array_top,1, _SC("a")},
-	{_SC("insert"),array_insert,3, _SC("an")},
-	{_SC("remove"),array_remove,2, _SC("an")},
-	{_SC("resize"),array_resize,-2, _SC("an")},
-	{_SC("reverse"),array_reverse,1, _SC("a")},
-	{_SC("sort"),array_sort,-1, _SC("ac")},
-	{_SC("slice"),array_slice,-1, _SC("ann")},
-	{_SC("weakref"),obj_delegate_weakref,1, NULL },
-	{_SC("tostring"),default_delegate_tostring,1, _SC(".")},
-	{_SC("clear"),obj_clear,1, _SC(".")},
-	{0,0,0,0}
-};
-
-//STRING DEFAULT DELEGATE//////////////////////////
-static SQInteger string_slice(HSQUIRRELVM v)
-{
-	SQInteger sidx,eidx;
-	SQObjectPtr o;
-	if(SQ_FAILED(get_slice_params(v,sidx,eidx,o)))return -1;
-	SQInteger slen = _string(o)->_len;
-	if(sidx < 0)sidx = slen + sidx;
-	if(eidx < 0)eidx = slen + eidx;
-	if(eidx < sidx)	return sq_throwerror(v,_SC("wrong indexes"));
-	if(eidx > slen)	return sq_throwerror(v,_SC("slice out of range"));
-	v->Push(SQString::Create(_ss(v),&_stringval(o)[sidx],eidx-sidx));
-	return 1;
-}
-
-static SQInteger string_find(HSQUIRRELVM v)
-{
-	SQInteger top,start_idx=0;
-	const SQChar *str,*substr,*ret;
-	if(((top=sq_gettop(v))>1) && SQ_SUCCEEDED(sq_getstring(v,1,&str)) && SQ_SUCCEEDED(sq_getstring(v,2,&substr))){
-		if(top>2)sq_getinteger(v,3,&start_idx);
-		if((sq_getsize(v,1)>start_idx) && (start_idx>=0)){
-			ret=scstrstr(&str[start_idx],substr);
-			if(ret){
-				sq_pushinteger(v,(SQInteger)(ret-str));
-				return 1;
-			}
-		}
-		return 0;
-	}
-	return sq_throwerror(v,_SC("invalid param"));
-}
-
-#define STRING_TOFUNCZ(func) static SQInteger string_##func(HSQUIRRELVM v) \
-{ \
-	SQObject str=stack_get(v,1); \
-	SQInteger len=_string(str)->_len; \
-	const SQChar *sThis=_stringval(str); \
-	SQChar *sNew=(_ss(v)->GetScratchPad(rsl(len))); \
-	for(SQInteger i=0;i<len;i++) sNew[i]=func(sThis[i]); \
-	v->Push(SQString::Create(_ss(v),sNew,len)); \
-	return 1; \
-}
-
-
-STRING_TOFUNCZ(tolower)
-STRING_TOFUNCZ(toupper)
-
-SQRegFunction SQSharedState::_string_default_delegate_funcz[]={
-	{_SC("len"),default_delegate_len,1, _SC("s")},
-	{_SC("tointeger"),default_delegate_tointeger,1, _SC("s")},
-	{_SC("tofloat"),default_delegate_tofloat,1, _SC("s")},
-	{_SC("tostring"),default_delegate_tostring,1, _SC(".")},
-	{_SC("slice"),string_slice,-1, _SC(" s n  n")},
-	{_SC("find"),string_find,-2, _SC("s s n ")},
-	{_SC("tolower"),string_tolower,1, _SC("s")},
-	{_SC("toupper"),string_toupper,1, _SC("s")},
-	{_SC("weakref"),obj_delegate_weakref,1, NULL },
-	{0,0,0,0}
-};
-
-//INTEGER DEFAULT DELEGATE//////////////////////////
-SQRegFunction SQSharedState::_number_default_delegate_funcz[]={
-	{_SC("tointeger"),default_delegate_tointeger,1, _SC("n|b")},
-	{_SC("tofloat"),default_delegate_tofloat,1, _SC("n|b")},
-	{_SC("tostring"),default_delegate_tostring,1, _SC(".")},
-	{_SC("tochar"),number_delegate_tochar,1, _SC("n|b")},
-	{_SC("weakref"),obj_delegate_weakref,1, NULL },
-	{0,0,0,0}
-};
-
-//CLOSURE DEFAULT DELEGATE//////////////////////////
-static SQInteger closure_pcall(HSQUIRRELVM v)
-{
-	return SQ_SUCCEEDED(sq_call(v,sq_gettop(v)-1,SQTrue,SQFalse))?1:SQ_ERROR;
-}
-
-static SQInteger closure_call(HSQUIRRELVM v)
-{
-	return SQ_SUCCEEDED(sq_call(v,sq_gettop(v)-1,SQTrue,SQTrue))?1:SQ_ERROR;
-}
-
-static SQInteger _closure_acall(HSQUIRRELVM v,SQBool raiseerror)
-{
-	SQArray *aparams=_array(stack_get(v,2));
-	SQInteger nparams=aparams->Size();
-	v->Push(stack_get(v,1));
-	for(SQInteger i=0;i<nparams;i++)v->Push(aparams->_values[i]);
-	return SQ_SUCCEEDED(sq_call(v,nparams,SQTrue,raiseerror))?1:SQ_ERROR;
-}
-
-static SQInteger closure_acall(HSQUIRRELVM v)
-{
-	return _closure_acall(v,SQTrue);
-}
-
-static SQInteger closure_pacall(HSQUIRRELVM v)
-{
-	return _closure_acall(v,SQFalse);
-}
-
-static SQInteger closure_bindenv(HSQUIRRELVM v)
-{
-	if(SQ_FAILED(sq_bindenv(v,1)))
-		return SQ_ERROR;
-	return 1;
-}
-
-static SQInteger closure_getinfos(HSQUIRRELVM v) {
-	SQObject o = stack_get(v,1);
-	SQTable *res = SQTable::Create(_ss(v),4);
-	if(type(o) == OT_CLOSURE) {
-		SQFunctionProto *f = _funcproto(_closure(o)->_function);
-		SQInteger nparams = f->_nparameters + (f->_varparams?1:0);
-		SQObjectPtr params = SQArray::Create(_ss(v),nparams);
-		for(SQInteger n = 0; n<f->_nparameters; n++) {
-			_array(params)->Set((SQInteger)n,f->_parameters[n]);
-		}
-		if(f->_varparams) {
-			_array(params)->Set(nparams-1,SQString::Create(_ss(v),_SC("..."),-1));
-		}
-		res->NewSlot(SQString::Create(_ss(v),_SC("native"),-1),false);
-		res->NewSlot(SQString::Create(_ss(v),_SC("name"),-1),f->_name);
-		res->NewSlot(SQString::Create(_ss(v),_SC("src"),-1),f->_sourcename);
-		res->NewSlot(SQString::Create(_ss(v),_SC("parameters"),-1),params);
-		res->NewSlot(SQString::Create(_ss(v),_SC("varargs"),-1),f->_varparams);
-	}
-	else { //OT_NATIVECLOSURE
-		SQNativeClosure *nc = _nativeclosure(o);
-		res->NewSlot(SQString::Create(_ss(v),_SC("native"),-1),true);
-		res->NewSlot(SQString::Create(_ss(v),_SC("name"),-1),nc->_name);
-		res->NewSlot(SQString::Create(_ss(v),_SC("paramscheck"),-1),nc->_nparamscheck);
-		SQObjectPtr typecheck;
-		if(nc->_typecheck.size() > 0) {
-			typecheck =
-				SQArray::Create(_ss(v), nc->_typecheck.size());
-			for(SQUnsignedInteger n = 0; n<nc->_typecheck.size(); n++) {
-					_array(typecheck)->Set((SQInteger)n,nc->_typecheck[n]);
-			}
-		}
-		res->NewSlot(SQString::Create(_ss(v),_SC("typecheck"),-1),typecheck);
-	}
-	v->Push(res);
-	return 1;
-}
-
-
-SQRegFunction SQSharedState::_closure_default_delegate_funcz[]={
-	{_SC("call"),closure_call,-1, _SC("c")},
-	{_SC("pcall"),closure_pcall,-1, _SC("c")},
-	{_SC("acall"),closure_acall,2, _SC("ca")},
-	{_SC("pacall"),closure_pacall,2, _SC("ca")},
-	{_SC("weakref"),obj_delegate_weakref,1, NULL },
-	{_SC("tostring"),default_delegate_tostring,1, _SC(".")},
-	{_SC("bindenv"),closure_bindenv,2, _SC("c x|y|t")},
-	{_SC("getinfos"),closure_getinfos,1, _SC("c")},
-	{0,0,0,0}
-};
-
-//GENERATOR DEFAULT DELEGATE
-static SQInteger generator_getstatus(HSQUIRRELVM v)
-{
-	SQObject &o=stack_get(v,1);
-	switch(_generator(o)->_state){
-		case SQGenerator::eSuspended:v->Push(SQString::Create(_ss(v),_SC("suspended")));break;
-		case SQGenerator::eRunning:v->Push(SQString::Create(_ss(v),_SC("running")));break;
-		case SQGenerator::eDead:v->Push(SQString::Create(_ss(v),_SC("dead")));break;
-	}
-	return 1;
-}
-
-SQRegFunction SQSharedState::_generator_default_delegate_funcz[]={
-	{_SC("getstatus"),generator_getstatus,1, _SC("g")},
-	{_SC("weakref"),obj_delegate_weakref,1, NULL },
-	{_SC("tostring"),default_delegate_tostring,1, _SC(".")},
-	{0,0,0,0}
-};
-
-//THREAD DEFAULT DELEGATE
-
-static SQInteger thread_call(HSQUIRRELVM v)
-{
-
-	SQObjectPtr o = stack_get(v,1);
-	if(type(o) == OT_THREAD) {
-		SQInteger nparams = sq_gettop(v);
-		_thread(o)->Push(_thread(o)->_roottable);
-		for(SQInteger i = 2; i<(nparams+1); i++)
-			sq_move(_thread(o),v,i);
-		if(SQ_SUCCEEDED(sq_call(_thread(o),nparams,SQTrue,SQFalse))) {
-			sq_move(v,_thread(o),-1);
-			sq_pop(_thread(o),1);
-			return 1;
-		}
-		v->_lasterror = _thread(o)->_lasterror;
-		return SQ_ERROR;
-	}
-	return sq_throwerror(v,_SC("wrong parameter"));
-}
-
-static SQInteger thread_wakeup(HSQUIRRELVM v)
-{
-	SQObjectPtr o = stack_get(v,1);
-	if(type(o) == OT_THREAD) {
-		SQVM *thread = _thread(o);
-		SQInteger state = sq_getvmstate(thread);
-		if(state != SQ_VMSTATE_SUSPENDED) {
-			switch(state) {
-				case SQ_VMSTATE_IDLE:
-					return sq_throwerror(v,_SC("cannot wakeup a idle thread"));
-				break;
-				case SQ_VMSTATE_RUNNING:
-					return sq_throwerror(v,_SC("cannot wakeup a running thread"));
-				break;
-			}
-		}
-
-		SQInteger wakeupret = sq_gettop(v)>1?1:0;
-		if(wakeupret) {
-			sq_move(thread,v,2);
-		}
-		if(SQ_SUCCEEDED(sq_wakeupvm(thread,wakeupret,SQTrue,SQFalse))) {
-			sq_move(v,thread,-1);
-			sq_pop(thread,1); //pop retval
-			if(sq_getvmstate(thread) == SQ_VMSTATE_IDLE) {
-				sq_settop(thread,1); //pop roottable
-			}
-			return 1;
-		}
-		sq_settop(thread,1);
-		v->_lasterror = thread->_lasterror;
-		return SQ_ERROR;
-	}
-	return sq_throwerror(v,_SC("wrong parameter"));
-}
-
-static SQInteger thread_getstatus(HSQUIRRELVM v)
-{
-	SQObjectPtr &o = stack_get(v,1);
-	switch(sq_getvmstate(_thread(o))) {
-		case SQ_VMSTATE_IDLE:
-			sq_pushstring(v,_SC("idle"),-1);
-		break;
-		case SQ_VMSTATE_RUNNING:
-			sq_pushstring(v,_SC("running"),-1);
-		break;
-		case SQ_VMSTATE_SUSPENDED:
-			sq_pushstring(v,_SC("suspended"),-1);
-		break;
-		default:
-			return sq_throwerror(v,_SC("internal VM error"));
-	}
-	return 1;
-}
-
-SQRegFunction SQSharedState::_thread_default_delegate_funcz[] = {
-	{_SC("call"), thread_call, -1, _SC("v")},
-	{_SC("wakeup"), thread_wakeup, -1, _SC("v")},
-	{_SC("getstatus"), thread_getstatus, 1, _SC("v")},
-	{_SC("weakref"),obj_delegate_weakref,1, NULL },
-	{_SC("tostring"),default_delegate_tostring,1, _SC(".")},
-	{0,0,0,0},
-};
-
-static SQInteger class_getattributes(HSQUIRRELVM v)
-{
-	if(SQ_SUCCEEDED(sq_getattributes(v,-2)))
-		return 1;
-	return SQ_ERROR;
-}
-
-static SQInteger class_setattributes(HSQUIRRELVM v)
-{
-	if(SQ_SUCCEEDED(sq_setattributes(v,-3)))
-		return 1;
-	return SQ_ERROR;
-}
-
-static SQInteger class_instance(HSQUIRRELVM v)
-{
-	if(SQ_SUCCEEDED(sq_createinstance(v,-1)))
-		return 1;
-	return SQ_ERROR;
-}
-
-SQRegFunction SQSharedState::_class_default_delegate_funcz[] = {
-	{_SC("getattributes"), class_getattributes, 2, _SC("y.")},
-	{_SC("setattributes"), class_setattributes, 3, _SC("y..")},
-	{_SC("rawin"),container_rawexists,2, _SC("y")},
-	{_SC("weakref"),obj_delegate_weakref,1, NULL },
-	{_SC("tostring"),default_delegate_tostring,1, _SC(".")},
-	{_SC("instance"),class_instance,1, _SC("y")},
-	{0,0,0,0}
-};
-
-static SQInteger instance_getclass(HSQUIRRELVM v)
-{
-	if(SQ_SUCCEEDED(sq_getclass(v,1)))
-		return 1;
-	return SQ_ERROR;
-}
-
-SQRegFunction SQSharedState::_instance_default_delegate_funcz[] = {
-	{_SC("getclass"), instance_getclass, 1, _SC("x")},
-	{_SC("rawin"),container_rawexists,2, _SC("x")},
-	{_SC("weakref"),obj_delegate_weakref,1, NULL },
-	{_SC("tostring"),default_delegate_tostring,1, _SC(".")},
-	{0,0,0,0}
-};
-
-static SQInteger weakref_ref(HSQUIRRELVM v)
-{
-	if(SQ_FAILED(sq_getweakrefval(v,1)))
-		return SQ_ERROR;
-	return 1;
-}
-
-SQRegFunction SQSharedState::_weakref_default_delegate_funcz[] = {
-	{_SC("ref"),weakref_ref,1, _SC("r")},
-	{_SC("weakref"),obj_delegate_weakref,1, NULL },
-	{_SC("tostring"),default_delegate_tostring,1, _SC(".")},
-	{0,0,0,0}
-};
-
-
@@ -1,194 +0,0 @@
-/*
-	see copyright notice in squirrel.h
-*/
-#include "sqpcheader.h"
-#include "sqvm.h"
-#include "sqtable.h"
-#include "sqclass.h"
-#include "sqclosure.h"
-
-SQClass::SQClass(SQSharedState *ss,SQClass *base)
-{
-	_base = base;
-	_typetag = 0;
-	_hook = NULL;
-	_udsize = 0;
-	_metamethods.resize(MT_LAST); //size it to max size
-	if(_base) {
-		_defaultvalues.copy(base->_defaultvalues);
-		_methods.copy(base->_methods);
-		_metamethods.copy(base->_metamethods);
-		__ObjAddRef(_base);
-	}
-	_members = base?base->_members->Clone() : SQTable::Create(ss,0);
-	__ObjAddRef(_members);
-	_locked = false;
-	INIT_CHAIN();
-	ADD_TO_CHAIN(&_sharedstate->_gc_chain, this);
-}
-
-void SQClass::Finalize() {
-	_attributes = _null_;
-	_defaultvalues.resize(0);
-	_methods.resize(0);
-	_metamethods.resize(0);
-	__ObjRelease(_members);
-	if(_base) {
-		__ObjRelease(_base);
-	}
-}
-
-SQClass::~SQClass()
-{
-	REMOVE_FROM_CHAIN(&_sharedstate->_gc_chain, this);
-	Finalize();
-}
-
-bool SQClass::NewSlot(SQSharedState *ss,const SQObjectPtr &key,const SQObjectPtr &val,bool bstatic)
-{
-	SQObjectPtr temp;
-	if(_locked)
-		return false; //the class already has an instance so cannot be modified
-	if(_members->Get(key,temp) && _isfield(temp)) //overrides the default value
-	{
-		_defaultvalues[_member_idx(temp)].val = val;
-		return true;
-	}
-	if(type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE || bstatic) {
-		SQInteger mmidx;
-		if((type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE) &&
-			(mmidx = ss->GetMetaMethodIdxByName(key)) != -1) {
-			_metamethods[mmidx] = val;
-		}
-		else {
-			if(type(temp) == OT_NULL) {
-				SQClassMember m;
-				m.val = val;
-				_members->NewSlot(key,SQObjectPtr(_make_method_idx(_methods.size())));
-				_methods.push_back(m);
-			}
-			else {
-				_methods[_member_idx(temp)].val = val;
-			}
-		}
-		return true;
-	}
-	SQClassMember m;
-	m.val = val;
-	_members->NewSlot(key,SQObjectPtr(_make_field_idx(_defaultvalues.size())));
-	_defaultvalues.push_back(m);
-	return true;
-}
-
-SQInstance *SQClass::CreateInstance()
-{
-	if(!_locked) Lock();
-	return SQInstance::Create(_opt_ss(this),this);
-}
-
-SQInteger SQClass::Next(const SQObjectPtr &refpos, SQObjectPtr &outkey, SQObjectPtr &outval)
-{
-	SQObjectPtr oval;
-	SQInteger idx = _members->Next(false,refpos,outkey,oval);
-	if(idx != -1) {
-		if(_ismethod(oval)) {
-			outval = _methods[_member_idx(oval)].val;
-		}
-		else {
-			SQObjectPtr &o = _defaultvalues[_member_idx(oval)].val;
-			outval = _realval(o);
-		}
-	}
-	return idx;
-}
-
-bool SQClass::SetAttributes(const SQObjectPtr &key,const SQObjectPtr &val)
-{
-	SQObjectPtr idx;
-	if(_members->Get(key,idx)) {
-		if(_isfield(idx))
-			_defaultvalues[_member_idx(idx)].attrs = val;
-		else
-			_methods[_member_idx(idx)].attrs = val;
-		return true;
-	}
-	return false;
-}
-
-bool SQClass::GetAttributes(const SQObjectPtr &key,SQObjectPtr &outval)
-{
-	SQObjectPtr idx;
-	if(_members->Get(key,idx)) {
-		outval = (_isfield(idx)?_defaultvalues[_member_idx(idx)].attrs:_methods[_member_idx(idx)].attrs);
-		return true;
-	}
-	return false;
-}
-
-///////////////////////////////////////////////////////////////////////
-void SQInstance::Init(SQSharedState *ss)
-{
-	_userpointer = NULL;
-	_hook = NULL;
-	__ObjAddRef(_class);
-	_delegate = _class->_members;
-	INIT_CHAIN();
-	ADD_TO_CHAIN(&_sharedstate->_gc_chain, this);
-}
-
-SQInstance::SQInstance(SQSharedState *ss, SQClass *c, SQInteger memsize)
-{
-	_memsize = memsize;
-	_class = c;
-	SQUnsignedInteger nvalues = _class->_defaultvalues.size();
-	for(SQUnsignedInteger n = 0; n < nvalues; n++) {
-		new (&_values[n]) SQObjectPtr(_class->_defaultvalues[n].val);
-	}
-	Init(ss);
-}
-
-SQInstance::SQInstance(SQSharedState *ss, SQInstance *i, SQInteger memsize)
-{
-	_memsize = memsize;
-	_class = i->_class;
-	SQUnsignedInteger nvalues = _class->_defaultvalues.size();
-	for(SQUnsignedInteger n = 0; n < nvalues; n++) {
-		new (&_values[n]) SQObjectPtr(i->_values[n]);
-	}
-	Init(ss);
-}
-
-void SQInstance::Finalize()
-{
-	SQUnsignedInteger nvalues = _class->_defaultvalues.size();
-	__ObjRelease(_class);
-	for(SQUnsignedInteger i = 0; i < nvalues; i++) {
-		_values[i] = _null_;
-	}
-}
-
-SQInstance::~SQInstance()
-{
-	REMOVE_FROM_CHAIN(&_sharedstate->_gc_chain, this);
-	if(_class){ Finalize(); } //if _class is null it was already finalized by the GC
-}
-
-bool SQInstance::GetMetaMethod(SQVM *v,SQMetaMethod mm,SQObjectPtr &res)
-{
-	if(type(_class->_metamethods[mm]) != OT_NULL) {
-		res = _class->_metamethods[mm];
-		return true;
-	}
-	return false;
-}
-
-bool SQInstance::InstanceOf(SQClass *trg)
-{
-	SQClass *parent = _class;
-	while(parent != NULL) {
-		if(parent == trg)
-			return true;
-		parent = parent->_base;
-	}
-	return false;
-}
@@ -1,162 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQCLASS_H_
-#define _SQCLASS_H_
-
-struct SQInstance;
-
-struct SQClassMember {
-	SQClassMember(){}
-	SQClassMember(const SQClassMember &o) {
-		val = o.val;
-		attrs = o.attrs;
-	}
-	SQObjectPtr val;
-	SQObjectPtr attrs;
-};
-
-typedef sqvector<SQClassMember> SQClassMemberVec;
-
-#define MEMBER_TYPE_METHOD 0x01000000
-#define MEMBER_TYPE_FIELD 0x02000000
-
-#define _ismethod(o) (_integer(o)&MEMBER_TYPE_METHOD)
-#define _isfield(o) (_integer(o)&MEMBER_TYPE_FIELD)
-#define _make_method_idx(i) ((SQInteger)(MEMBER_TYPE_METHOD|i))
-#define _make_field_idx(i) ((SQInteger)(MEMBER_TYPE_FIELD|i))
-#define _member_type(o) (_integer(o)&0xFF000000)
-#define _member_idx(o) (_integer(o)&0x00FFFFFF)
-
-struct SQClass : public CHAINABLE_OBJ
-{
-	SQClass(SQSharedState *ss,SQClass *base);
-public:
-	static SQClass* Create(SQSharedState *ss,SQClass *base) {
-		SQClass *newclass = (SQClass *)SQ_MALLOC(sizeof(SQClass));
-		new (newclass) SQClass(ss, base);
-		return newclass;
-	}
-	~SQClass();
-	bool NewSlot(SQSharedState *ss, const SQObjectPtr &key,const SQObjectPtr &val,bool bstatic);
-	bool Get(const SQObjectPtr &key,SQObjectPtr &val) {
-		if(_members->Get(key,val)) {
-			if(_isfield(val)) {
-				SQObjectPtr &o = _defaultvalues[_member_idx(val)].val;
-				val = _realval(o);
-			}
-			else {
-				val = _methods[_member_idx(val)].val;
-			}
-			return true;
-		}
-		return false;
-	}
-	bool SetAttributes(const SQObjectPtr &key,const SQObjectPtr &val);
-	bool GetAttributes(const SQObjectPtr &key,SQObjectPtr &outval);
-	void Lock() { _locked = true; if(_base) _base->Lock(); }
-	void Release() {
-		if (_hook) { _hook(_typetag,0);}
-		sq_delete(this, SQClass);
-	}
-	void Finalize();
-#ifndef NO_GARBAGE_COLLECTOR
-	void Mark(SQCollectable ** );
-#endif
-	SQInteger Next(const SQObjectPtr &refpos, SQObjectPtr &outkey, SQObjectPtr &outval);
-	SQInstance *CreateInstance();
-	SQTable *_members;
-	SQClass *_base;
-	SQClassMemberVec _defaultvalues;
-	SQClassMemberVec _methods;
-	SQObjectPtrVec _metamethods;
-	SQObjectPtr _attributes;
-	SQUserPointer _typetag;
-	SQRELEASEHOOK _hook;
-	bool _locked;
-	SQInteger _udsize;
-};
-
-#define calcinstancesize(_theclass_) \
-	(_theclass_->_udsize + sizeof(SQInstance) + (sizeof(SQObjectPtr)*(_theclass_->_defaultvalues.size()>0?_theclass_->_defaultvalues.size()-1:0)))
-
-struct SQInstance : public SQDelegable
-{
-	void Init(SQSharedState *ss);
-	SQInstance(SQSharedState *ss, SQClass *c, SQInteger memsize);
-	SQInstance(SQSharedState *ss, SQInstance *c, SQInteger memsize);
-public:
-	static SQInstance* Create(SQSharedState *ss,SQClass *theclass) {
-
-		SQInteger size = calcinstancesize(theclass);
-		SQInstance *newinst = (SQInstance *)SQ_MALLOC(size);
-		new (newinst) SQInstance(ss, theclass,size);
-		if(theclass->_udsize) {
-			newinst->_userpointer = ((unsigned char *)newinst) + (size - theclass->_udsize);
-		}
-		return newinst;
-	}
-	SQInstance *Clone(SQSharedState *ss)
-	{
-		SQInteger size = calcinstancesize(_class);
-		SQInstance *newinst = (SQInstance *)SQ_MALLOC(size);
-		new (newinst) SQInstance(ss, this,size);
-		if(_class->_udsize) {
-			newinst->_userpointer = ((unsigned char *)newinst) + (size - _class->_udsize);
-		}
-		return newinst;
-	}
-	~SQInstance();
-	bool Get(const SQObjectPtr &key,SQObjectPtr &val)  {
-		if(_class->_members->Get(key,val)) {
-			if(_isfield(val)) {
-				SQObjectPtr &o = _values[_member_idx(val)];
-				val = _realval(o);
-			}
-			else {
-				val = _class->_methods[_member_idx(val)].val;
-			}
-			return true;
-		}
-		return false;
-	}
-	bool Set(const SQObjectPtr &key,const SQObjectPtr &val) {
-		SQObjectPtr idx;
-		if(_class->_members->Get(key,idx) && _isfield(idx)) {
-            _values[_member_idx(idx)] = val;
-			return true;
-		}
-		return false;
-	}
-	void Release() {
-		_uiRef++;
-		try {
-			if (_hook) { _hook(_userpointer,0);}
-		} catch (...) {
-			_uiRef--;
-			if (_uiRef == 0) {
-				SQInteger size = _memsize;
-				this->~SQInstance();
-				SQ_FREE(this, size);
-			}
-			throw;
-		}
-		_uiRef--;
-		if(_uiRef > 0) return;
-		SQInteger size = _memsize;
-		this->~SQInstance();
-		SQ_FREE(this, size);
-	}
-	void Finalize();
-#ifndef NO_GARBAGE_COLLECTOR
-	void Mark(SQCollectable ** );
-#endif
-	bool InstanceOf(SQClass *trg);
-	bool GetMetaMethod(SQVM *v,SQMetaMethod mm,SQObjectPtr &res);
-
-	SQClass *_class;
-	SQUserPointer _userpointer;
-	SQRELEASEHOOK _hook;
-	SQInteger _memsize;
-	SQObjectPtr _values[1];
-};
-
-#endif //_SQCLASS_H_
@@ -1,122 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQCLOSURE_H_
-#define _SQCLOSURE_H_
-
-struct SQFunctionProto;
-
-struct SQClosure : public CHAINABLE_OBJ
-{
-private:
-	SQClosure(SQSharedState *ss,SQFunctionProto *func){_function=func; INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this);}
-public:
-	static SQClosure *Create(SQSharedState *ss,SQFunctionProto *func){
-		SQClosure *nc=(SQClosure*)SQ_MALLOC(sizeof(SQClosure));
-		new (nc) SQClosure(ss,func);
-		return nc;
-	}
-	void Release(){
-		sq_delete(this,SQClosure);
-	}
-	SQClosure *Clone()
-	{
-		SQClosure * ret = SQClosure::Create(_opt_ss(this),_funcproto(_function));
-		ret->_env = _env;
-		ret->_outervalues.copy(_outervalues);
-		ret->_defaultparams.copy(_defaultparams);
-		return ret;
-	}
-	~SQClosure()
-	{
-		REMOVE_FROM_CHAIN(&_ss(this)->_gc_chain,this);
-	}
-	bool Save(SQVM *v,SQUserPointer up,SQWRITEFUNC write);
-	static bool Load(SQVM *v,SQUserPointer up,SQREADFUNC read,SQObjectPtr &ret);
-#ifndef NO_GARBAGE_COLLECTOR
-	void Mark(SQCollectable **chain);
-	void Finalize(){_outervalues.resize(0); }
-#endif
-	SQObjectPtr _env;
-	SQObjectPtr _function;
-	SQObjectPtrVec _outervalues;
-	SQObjectPtrVec _defaultparams;
-};
-//////////////////////////////////////////////
-struct SQGenerator : public CHAINABLE_OBJ
-{
-	enum SQGeneratorState{eRunning,eSuspended,eDead};
-private:
-	SQGenerator(SQSharedState *ss,SQClosure *closure){_closure=closure;_state=eRunning;_ci._generator=NULL;INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this);}
-public:
-	static SQGenerator *Create(SQSharedState *ss,SQClosure *closure){
-		SQGenerator *nc=(SQGenerator*)SQ_MALLOC(sizeof(SQGenerator));
-		new (nc) SQGenerator(ss,closure);
-		return nc;
-	}
-	~SQGenerator()
-	{
-		REMOVE_FROM_CHAIN(&_ss(this)->_gc_chain,this);
-	}
-    void Kill(){
-		_state=eDead;
-		_stack.resize(0);
-		_closure=_null_;}
-	void Release(){
-		sq_delete(this,SQGenerator);
-	}
-	bool Yield(SQVM *v);
-	bool Resume(SQVM *v,SQInteger target);
-#ifndef NO_GARBAGE_COLLECTOR
-	void Mark(SQCollectable **chain);
-	void Finalize(){_stack.resize(0);_closure=_null_;}
-#endif
-	SQObjectPtr _closure;
-	SQObjectPtrVec _stack;
-	SQObjectPtrVec _vargsstack;
-	SQVM::CallInfo _ci;
-	ExceptionsTraps _etraps;
-	SQGeneratorState _state;
-};
-
-struct SQNativeClosure : public CHAINABLE_OBJ
-{
-private:
-	SQNativeClosure(SQSharedState *ss,SQFUNCTION func){_function=func;INIT_CHAIN();ADD_TO_CHAIN(&_ss(this)->_gc_chain,this);	}
-public:
-	static SQNativeClosure *Create(SQSharedState *ss,SQFUNCTION func)
-	{
-		SQNativeClosure *nc=(SQNativeClosure*)SQ_MALLOC(sizeof(SQNativeClosure));
-		new (nc) SQNativeClosure(ss,func);
-		return nc;
-	}
-	SQNativeClosure *Clone()
-	{
-		SQNativeClosure * ret = SQNativeClosure::Create(_opt_ss(this),_function);
-		ret->_env = _env;
-		ret->_name = _name;
-		ret->_outervalues.copy(_outervalues);
-		ret->_typecheck.copy(_typecheck);
-		ret->_nparamscheck = _nparamscheck;
-		return ret;
-	}
-	~SQNativeClosure()
-	{
-		REMOVE_FROM_CHAIN(&_ss(this)->_gc_chain,this);
-	}
-	void Release(){
-		sq_delete(this,SQNativeClosure);
-	}
-#ifndef NO_GARBAGE_COLLECTOR
-	void Mark(SQCollectable **chain);
-	void Finalize(){_outervalues.resize(0);}
-#endif
-	SQInteger _nparamscheck;
-	SQIntVec _typecheck;
-	SQObjectPtrVec _outervalues;
-	SQObjectPtr _env;
-	SQFUNCTION _function;
-	SQObjectPtr _name;
-};
-
-
-
-#endif //_SQCLOSURE_H_
@@ -1,77 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQCOMPILER_H_
-#define _SQCOMPILER_H_
-
-struct SQVM;
-
-#define	TK_IDENTIFIER	258
-#define	TK_STRING_LITERAL	259
-#define	TK_INTEGER	260
-#define	TK_FLOAT	261
-#define	TK_DELEGATE	262
-#define	TK_DELETE	263
-#define	TK_EQ	264
-#define	TK_NE	265
-#define	TK_LE	266
-#define	TK_GE	267
-#define	TK_SWITCH	268
-#define	TK_ARROW	269
-#define	TK_AND	270
-#define	TK_OR	271
-#define	TK_IF	272
-#define	TK_ELSE	273
-#define	TK_WHILE	274
-#define	TK_BREAK	275
-#define	TK_FOR	276
-#define	TK_DO	277
-#define	TK_NULL	278
-#define	TK_FOREACH	279
-#define	TK_IN	280
-#define	TK_NEWSLOT	281
-#define	TK_MODULO	282
-#define	TK_LOCAL	283
-#define	TK_CLONE	284
-#define	TK_FUNCTION	285
-#define	TK_RETURN	286
-#define	TK_TYPEOF	287
-#define	TK_UMINUS	288
-#define	TK_PLUSEQ	289
-#define	TK_MINUSEQ	290
-#define	TK_CONTINUE	291
-#define TK_YIELD 292
-#define TK_TRY 293
-#define TK_CATCH 294
-#define TK_THROW 295
-#define TK_SHIFTL 296
-#define TK_SHIFTR 297
-#define TK_RESUME 298
-#define TK_DOUBLE_COLON 299
-#define TK_CASE 300
-#define TK_DEFAULT 301
-#define TK_THIS 302
-#define TK_PLUSPLUS 303
-#define TK_MINUSMINUS 304
-#define TK_PARENT 305
-#define TK_USHIFTR 306
-#define TK_CLASS 307
-#define TK_EXTENDS 308
-#define TK_CONSTRUCTOR 310
-#define TK_INSTANCEOF 311
-#define TK_VARPARAMS 312
-#define TK_VARGC 313
-#define TK_VARGV 314
-#define TK_TRUE 315
-#define TK_FALSE 316
-#define TK_MULEQ 317
-#define TK_DIVEQ 318
-#define TK_MODEQ 319
-#define TK_ATTR_OPEN 320
-#define TK_ATTR_CLOSE 321
-#define TK_STATIC 322
-#define TK_ENUM 323
-#define TK_CONST 324
-
-
-typedef void(*CompilerErrorFunc)(void *ud, const SQChar *s);
-bool Compile(SQVM *vm, SQLEXREADFUNC rg, SQUserPointer up, const SQChar *sourcename, SQObjectPtr &out, bool raiseerror, bool lineinfo);
-#endif //_SQCOMPILER_H_
@@ -1,104 +0,0 @@
-/*
-	see copyright notice in squirrel.h
-*/
-#include <squirrel.h>
-#include "sqpcheader.h"
-#include <stdarg.h>
-#include "sqvm.h"
-#include "sqfuncproto.h"
-#include "sqclosure.h"
-#include "sqstring.h"
-
-SQRESULT sq_stackinfos(HSQUIRRELVM v, SQInteger level, SQStackInfos *si)
-{
-	SQInteger cssize = v->_callsstacksize;
-	if (cssize > level) {
-		memset(si, 0, sizeof(SQStackInfos));
-		SQVM::CallInfo &ci = v->_callsstack[cssize-level-1];
-		switch (type(ci._closure)) {
-		case OT_CLOSURE:{
-			SQFunctionProto *func = _funcproto(_closure(ci._closure)->_function);
-			if (type(func->_name) == OT_STRING)
-				si->funcname = _stringval(func->_name);
-			if (type(func->_sourcename) == OT_STRING)
-				si->source = _stringval(func->_sourcename);
-			si->line = func->GetLine(ci._ip);
-						}
-			break;
-		case OT_NATIVECLOSURE:
-			si->source = _SC("NATIVE");
-			si->funcname = _SC("unknown");
-			if(type(_nativeclosure(ci._closure)->_name) == OT_STRING)
-				si->funcname = _stringval(_nativeclosure(ci._closure)->_name);
-			si->line = -1;
-			break;
-		default: break; //shutup compiler
-		}
-		return SQ_OK;
-	}
-	return SQ_ERROR;
-}
-
-void SQVM::Raise_Error(const SQChar *s, ...)
-{
-	va_list vl;
-	va_start(vl, s);
-	scvsprintf(_sp(rsl((SQInteger)scstrlen(s)+(NUMBER_MAX_CHAR*2))), s, vl);
-	va_end(vl);
-	_lasterror = SQString::Create(_ss(this),_spval,-1);
-}
-
-void SQVM::Raise_Error(SQObjectPtr &desc)
-{
-	_lasterror = desc;
-}
-
-SQString *SQVM::PrintObjVal(const SQObject &o)
-{
-	switch(type(o)) {
-	case OT_STRING: return _string(o);
-	case OT_INTEGER:
-#if defined(_SQ64)
-		scsprintf(_sp(rsl(NUMBER_MAX_CHAR+1)), _SC("%ld"), _integer(o));
-#else
-		scsprintf(_sp(rsl(NUMBER_MAX_CHAR+1)), _SC("%d"), _integer(o));
-#endif
-		return SQString::Create(_ss(this), _spval);
-		break;
-	case OT_FLOAT:
-		scsprintf(_sp(rsl(NUMBER_MAX_CHAR+1)), _SC("%.14g"), _float(o));
-		return SQString::Create(_ss(this), _spval);
-		break;
-	default:
-		return SQString::Create(_ss(this), GetTypeName(o));
-	}
-}
-
-void SQVM::Raise_IdxError(SQObject &o)
-{
-	SQObjectPtr oval = PrintObjVal(o);
-	Raise_Error(_SC("the index '%.50s' does not exist"), _stringval(oval));
-}
-
-void SQVM::Raise_CompareError(const SQObject &o1, const SQObject &o2)
-{
-	SQObjectPtr oval1 = PrintObjVal(o1), oval2 = PrintObjVal(o2);
-	Raise_Error(_SC("comparsion between '%.50s' and '%.50s'"), _stringval(oval1), _stringval(oval2));
-}
-
-
-void SQVM::Raise_ParamTypeError(SQInteger nparam,SQInteger typemask,SQInteger type)
-{
-	SQObjectPtr exptypes = SQString::Create(_ss(this), _SC(""), -1);
-	SQInteger found = 0;
-	for(SQInteger i=0; i<16; i++)
-	{
-		SQInteger mask = 0x00000001 << i;
-		if(typemask & (mask)) {
-			if(found>0) StringCat(exptypes,SQString::Create(_ss(this), _SC("|"), -1), exptypes);
-			found ++;
-			StringCat(exptypes,SQString::Create(_ss(this), IdType2Name((SQObjectType)mask), -1), exptypes);
-		}
-	}
-	Raise_Error(_SC("parameter %d has an invalid type '%s' ; expected: '%s'"), nparam, IdType2Name((SQObjectType)type), _stringval(exptypes));
-}
@@ -1,160 +0,0 @@
-/*	see copyright notice in squirrel.h */
-#ifndef _SQFUNCTION_H_
-#define _SQFUNCTION_H_
-
-#include "sqopcodes.h"
-
-enum SQOuterType {
-	otLOCAL = 0,
-	otSYMBOL = 1,
-	otOUTER = 2
-};
-
-struct SQOuterVar
-{
-
-	SQOuterVar(){}
-	SQOuterVar(const SQObjectPtr &name,const SQObjectPtr &src,SQOuterType t)
-	{
-		_name = name;
-		_src=src;
-		_type=t;
-	}
-	SQOuterVar(const SQOuterVar &ov)
-	{
-		_type=ov._type;
-		_src=ov._src;
-		_name=ov._name;
-	}
-	SQOuterType _type;
-	SQObjectPtr _name;
-	SQObjectPtr _src;
-};
-
-struct SQLocalVarInfo
-{
-	SQLocalVarInfo():_start_op(0),_end_op(0){}
-	SQLocalVarInfo(const SQLocalVarInfo &lvi)
-	{
-		_name=lvi._name;
-		_start_op=lvi._start_op;
-		_end_op=lvi._end_op;
-		_pos=lvi._pos;
-	}
-	SQObjectPtr _name;
-	SQUnsignedInteger _start_op;
-	SQUnsignedInteger _end_op;
-	SQUnsignedInteger _pos;
-};
-
-struct SQLineInfo { SQInteger _line;SQInteger _op; };
-
-typedef sqvector<SQOuterVar> SQOuterVarVec;
-typedef sqvector<SQLocalVarInfo> SQLocalVarInfoVec;
-typedef sqvector<SQLineInfo> SQLineInfoVec;
-
-#define _FUNC_SIZE(ni,nl,nparams,nfuncs,nouters,nlineinf,localinf,defparams) (sizeof(SQFunctionProto) \
-		+((ni-1)*sizeof(SQInstruction))+(nl*sizeof(SQObjectPtr)) \
-		+(nparams*sizeof(SQObjectPtr))+(nfuncs*sizeof(SQObjectPtr)) \
-		+(nouters*sizeof(SQOuterVar))+(nlineinf*sizeof(SQLineInfo)) \
-		+(localinf*sizeof(SQLocalVarInfo))+(defparams*sizeof(SQInteger)))
-
-#define _CONSTRUCT_VECTOR(type,size,ptr) { \
-	for(SQInteger n = 0; n < size; n++) { \
-			new (&ptr[n]) type(); \
-		} \
-}
-
-#define _DESTRUCT_VECTOR(type,size,ptr) { \
-	for(SQInteger nl = 0; nl < size; nl++) { \
-			ptr[nl].~type(); \
-	} \
-}
-struct SQFunctionProto : public SQRefCounted
-{
-private:
-	SQFunctionProto(){
-	_stacksize=0;
-	_bgenerator=false;}
-public:
-	static SQFunctionProto *Create(SQInteger ninstructions,
-		SQInteger nliterals,SQInteger nparameters,
-		SQInteger nfunctions,SQInteger noutervalues,
-		SQInteger nlineinfos,SQInteger nlocalvarinfos,SQInteger ndefaultparams)
-	{
-		SQFunctionProto *f;
-		//I compact the whole class and members in a single memory allocation
-		f = (SQFunctionProto *)sq_vm_malloc(_FUNC_SIZE(ninstructions,nliterals,nparameters,nfunctions,noutervalues,nlineinfos,nlocalvarinfos,ndefaultparams));
-		new (f) SQFunctionProto;
-		f->_ninstructions = ninstructions;
-		f->_literals = (SQObjectPtr*)&f->_instructions[ninstructions];
-		f->_nliterals = nliterals;
-		f->_parameters = (SQObjectPtr*)&f->_literals[nliterals];
-		f->_nparameters = nparameters;
-		f->_functions = (SQObjectPtr*)&f->_parameters[nparameters];
-		f->_nfunctions = nfunctions;
-		f->_outervalues = (SQOuterVar*)&f->_functions[nfunctions];
-		f->_noutervalues = noutervalues;
-		f->_lineinfos = (SQLineInfo *)&f->_outervalues[noutervalues];
-		f->_nlineinfos = nlineinfos;
-		f->_localvarinfos = (SQLocalVarInfo *)&f->_lineinfos[nlineinfos];
-		f->_nlocalvarinfos = nlocalvarinfos;
-		f->_defaultparams = (SQInteger *)&f->_localvarinfos[nlocalvarinfos];
-		f->_ndefaultparams = ndefaultparams;
-
-		_CONSTRUCT_VECTOR(SQObjectPtr,f->_nliterals,f->_literals);
-		_CONSTRUCT_VECTOR(SQObjectPtr,f->_nparameters,f->_parameters);
-		_CONSTRUCT_VECTOR(SQObjectPtr,f->_nfunctions,f->_functions);
-		_CONSTRUCT_VECTOR(SQOuterVar,f->_noutervalues,f->_outervalues);
-		//_CONSTRUCT_VECTOR(SQLineInfo,f->_nlineinfos,f->_lineinfos); //not required are 2 integers
-		_CONSTRUCT_VECTOR(SQLocalVarInfo,f->_nlocalvarinfos,f->_localvarinfos);
-		return f;
-	}
-	void Release(){
-		_DESTRUCT_VECTOR(SQObjectPtr,_nliterals,_literals);
-		_DESTRUCT_VECTOR(SQObjectPtr,_nparameters,_parameters);
-		_DESTRUCT_VECTOR(SQObjectPtr,_nfunctions,_functions);
-		_DESTRUCT_VECTOR(SQOuterVar,_noutervalues,_outervalues);
-		//_DESTRUCT_VECTOR(SQLineInfo,_nlineinfos,_lineinfos); //not required are 2 integers
-		_DESTRUCT_VECTOR(SQLocalVarInfo,_nlocalvarinfos,_localvarinfos);
-		SQInteger size = _FUNC_SIZE(_ninstructions,_nliterals,_nparameters,_nfunctions,_noutervalues,_nlineinfos,_nlocalvarinfos,_ndefaultparams);
-		this->~SQFunctionProto();
-		sq_vm_free(this,size);
-	}
-	const SQChar* GetLocal(SQVM *v,SQUnsignedInteger stackbase,SQUnsignedInteger nseq,SQUnsignedInteger nop);
-	SQInteger GetLine(SQInstruction *curr);
-	bool Save(SQVM *v,SQUserPointer up,SQWRITEFUNC write);
-	static bool Load(SQVM *v,SQUserPointer up,SQREADFUNC read,SQObjectPtr &ret);
-
-	SQObjectPtr _sourcename;
-	SQObjectPtr _name;
-    SQInteger _stacksize;
-	bool _bgenerator;
-	bool _varparams;
-
-	SQInteger _nlocalvarinfos;
-	SQLocalVarInfo *_localvarinfos;
-
-	SQInteger _nlineinfos;
-	SQLineInfo *_lineinfos;
-
-	SQInteger _nliterals;
-	SQObjectPtr *_literals;
-
-	SQInteger _nparameters;
-	SQObjectPtr *_parameters;
-
-	SQInteger _nfunctions;
-	SQObjectPtr *_functions;
-
-	SQInteger _noutervalues;
-	SQOuterVar *_outervalues;
-
-	SQInteger _ndefaultparams;
-	SQInteger *_defaultparams;
-
-	SQInteger _ninstructions;
-	SQInstruction _instructions[1];
-};
-
-#endif //_SQFUNCTION_H_
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
rubidium	9c3f84c917	(svn r15504) -Fix: today is Friday 13th, right?	2009-02-16 22:59:15 +00:00
rubidium	1393eff268	(svn r15503) -Fix: svn:externals didn't do what I wanted it to do, even though it is documented to do what I wanted it to do. Lets hope this one works as I want it to.	2009-02-16 22:01:31 +00:00
rubidium	11c394b228	(svn r15502) -Release 0.7.0-beta1. Many new features, small and big. Happy testing!	2009-02-16 21:59:33 +00:00