Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r23648) -Revert (r23646): partial revert; nobody has to know about my local changes and attempts

Browse Source
This commit is contained in:
truebrain 2011-12-21 12:28:02 +00:00
parent 726ce254ff
commit e1f04b89c3
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/openttd_vs100.vcxproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
@ -144,7 +144,6 @@
</DataExecutionPrevention> </DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<Profile>true</Profile>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -244,7 +243,6 @@
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<TargetMachine>MachineX64</TargetMachine> <TargetMachine>MachineX64</TargetMachine>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<Profile>true</Profile>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

2
src/company_cmd.cpp
View File

@ -695,7 +695,7 @@ void OnTick_Companies()
} }
if (_next_competitor_start == 0) { if (_next_competitor_start == 0) {
_next_competitor_start = 1; //AI::GetStartNextTime() * DAY_TICKS; _next_competitor_start = AI::GetStartNextTime() * DAY_TICKS;
} }
if (AI::CanStartNew() && _game_mode != GM_MENU && --_next_competitor_start == 0) { if (AI::CanStartNew() && _game_mode != GM_MENU && --_next_competitor_start == 0) {

2
src/music/dmusic.cpp
View File

@ -9,7 +9,7 @@
/** @file dmusic.cpp Playing music via DirectMusic. */ /** @file dmusic.cpp Playing music via DirectMusic. */
#ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT_2 #ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT
#define INITGUID #define INITGUID
#include "../stdafx.h" #include "../stdafx.h"

6
src/script/api/script_list.cpp
View File

@ -818,15 +818,13 @@ SQInteger ScriptList::Valuate(HSQUIRRELVM vm)
sq_push(vm, 2); sq_push(vm, 2);
for (ScriptListMap::iterator iter = this->items.begin(); iter != this->items.end(); iter++) { for (ScriptListMap::iterator iter = this->items.begin(); iter != this->items.end(); iter++) {
int key = (*iter).first;
/* Check for changing of items. */ /* Check for changing of items. */
int previous_modification_count = this->modifications; int previous_modification_count = this->modifications;
/* Push the root table as instance object, this is what squirrel does for meta-functions. */ /* Push the root table as instance object, this is what squirrel does for meta-functions. */
sq_pushroottable(vm); sq_pushroottable(vm);
/* Push all arguments for the valuator function. */ /* Push all arguments for the valuator function. */
sq_pushinteger(vm, key); sq_pushinteger(vm, (*iter).first);
for (int i = 0; i < nparam - 1; i++) { for (int i = 0; i < nparam - 1; i++) {
sq_push(vm, i + 3); sq_push(vm, i + 3);
} }
@ -870,7 +868,7 @@ SQInteger ScriptList::Valuate(HSQUIRRELVM vm)
return sq_throwerror(vm, _SC("modifying valuated list outside of valuator function")); return sq_throwerror(vm, _SC("modifying valuated list outside of valuator function"));
} }
this->SetValue(key, value); this->SetValue((*iter).first, value);
/* Pop the return value. */ /* Pop the return value. */
sq_poptop(vm); sq_poptop(vm);