| changeset 10959 | 1225f42f61e2 |
| parent 10472 | 8d04cebedb16 |
| child 11046 | 47a8c19ecb60 |
| 10957:f3fcba306da9 | 10959:1225f42f61e2 |
|---|---|
40 bool HWMap::couldBeRemoved() |
40 bool HWMap::couldBeRemoved() |
41 { |
41 { |
42 return !m_hasStarted; |
42 return !m_hasStarted; |
43 } |
43 } |
44 |
44 |
45 void HWMap::getImage(const QString & seed, int filter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData, QString & script, int feature_size) |
45 void HWMap::getImage(const QString & seed, int filter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData, QString & script, QString & scriptparam, int feature_size) |
46 { |
46 { |
47 m_seed = seed; |
47 m_seed = seed; |
48 m_script = script; |
48 m_script = script; |
49 m_scriptparam = scriptparam; |
|
49 templateFilter = filter; |
50 templateFilter = filter; |
50 m_mapgen = mapgen; |
51 m_mapgen = mapgen; |
51 m_maze_size = maze_size; // TODO replace with feature_size |
52 m_maze_size = maze_size; |
52 m_feature_size = feature_size; |
53 m_feature_size = feature_size; |
53 if(mapgen == MAPGEN_DRAWN) m_drawMapData = drawMapData; |
54 if(mapgen == MAPGEN_DRAWN) m_drawMapData = drawMapData; |
54 Start(true); |
55 Start(true); |
55 } |
56 } |
56 |
57 |
123 SendIPC(QString("e$mapgen %1").arg(m_mapgen).toUtf8()); |
124 SendIPC(QString("e$mapgen %1").arg(m_mapgen).toUtf8()); |
124 SendIPC(QString("e$feature_size %1").arg(m_feature_size).toUtf8()); |
125 SendIPC(QString("e$feature_size %1").arg(m_feature_size).toUtf8()); |
125 if (!m_script.isEmpty()) |
126 if (!m_script.isEmpty()) |
126 { |
127 { |
127 SendIPC(QString("escript Scripts/Multiplayer/%1.lua").arg(m_script).toUtf8()); |
128 SendIPC(QString("escript Scripts/Multiplayer/%1.lua").arg(m_script).toUtf8()); |
129 SendIPC(QString("e$scriptparam %1").arg(m_scriptparam).toUtf8()); |
|
128 } |
130 } |
129 |
131 |
130 switch (m_mapgen) |
132 switch (m_mapgen) |
131 { |
133 { |
132 case MAPGEN_MAZE: |
134 case MAPGEN_MAZE: |