Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

fix: alpha map texture wasn't initialized, which caused crash if multiplayer -> host -> continue -> cancel

Browse Source 
thanks to anton for noticing and reporting the problem :)

also: fix hardcoded paths in rmgen to point to mods/public

This was SVN commit r6429.
This commit is contained in:
janwas 2008-10-18 17:58:04 +00:00
parent 02ce159934
commit becab2d479
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/renderer/Renderer.cpp
View File

@ -360,6 +360,7 @@ CRenderer::CRenderer()
for (size_t i=0;i<MaxTextureUnits;i++) {
m_ActiveTextures[i]=0;
}
m_hCompositeAlphaMap = 0;
AddLocalProperty(L"fancyWater", &m_Options.m_FancyWater, false);
AddLocalProperty(L"horizonHeight", &m->skyManager.m_HorizonHeight, false);

2
source/tools/rmgen/map.cpp
View File

@ -63,7 +63,7 @@ Map::Map(string fileName, int loadLevel)
u32 map_size;
//HACK, also in rmgen.cpp
const string SCENARIO_PATH = "../data/mods/official/maps/scenarios/";
const string SCENARIO_PATH = "../data/mods/public/maps/scenarios/";
std::string pmpFile = SCENARIO_PATH + fileName + ".pmp";
std::string xmlFile = SCENARIO_PATH + fileName + ".xml";

6
source/tools/rmgen/rmgen.cpp
View File

@ -107,9 +107,9 @@ void ExecuteFile(const string& fileName) {
int main(int argc, char* argv[])
{
const string LIBRARY_FILE = "../data/mods/official/maps/rmlibrary.js";
const string RMS_PATH = "../data/mods/official/maps/random/";
const string SCENARIO_PATH = "../data/mods/official/maps/scenarios/";
const string LIBRARY_FILE = "../data/mods/public/maps/rmlibrary.js";
const string RMS_PATH = "../data/mods/public/maps/random/";
const string SCENARIO_PATH = "../data/mods/public/maps/scenarios/";
clock_t start = clock();