equal
deleted
inserted
replaced
32 bool HWMap::couldBeRemoved() |
32 bool HWMap::couldBeRemoved() |
33 { |
33 { |
34 return !m_hasStarted; |
34 return !m_hasStarted; |
35 } |
35 } |
36 |
36 |
37 void HWMap::getImage(const QString & seed, int filter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData) |
37 void HWMap::getImage(const QString & seed, int filter, MapGenerator mapgen, int maze_size, const QByteArray & drawMapData, QString & script) |
38 { |
38 { |
39 m_seed = seed; |
39 m_seed = seed; |
|
40 m_script = script; |
40 templateFilter = filter; |
41 templateFilter = filter; |
41 m_mapgen = mapgen; |
42 m_mapgen = mapgen; |
42 m_maze_size = maze_size; |
43 m_maze_size = maze_size; |
43 if(mapgen == MAPGEN_DRAWN) m_drawMapData = drawMapData; |
44 if(mapgen == MAPGEN_DRAWN) m_drawMapData = drawMapData; |
44 Start(true); |
45 Start(true); |
71 void HWMap::SendToClientFirst() |
72 void HWMap::SendToClientFirst() |
72 { |
73 { |
73 SendIPC(QString("eseed %1").arg(m_seed).toUtf8()); |
74 SendIPC(QString("eseed %1").arg(m_seed).toUtf8()); |
74 SendIPC(QString("e$template_filter %1").arg(templateFilter).toUtf8()); |
75 SendIPC(QString("e$template_filter %1").arg(templateFilter).toUtf8()); |
75 SendIPC(QString("e$mapgen %1").arg(m_mapgen).toUtf8()); |
76 SendIPC(QString("e$mapgen %1").arg(m_mapgen).toUtf8()); |
|
77 if (m_script.length()) |
|
78 { |
|
79 SendIPC(QString("escript Scripts/Multiplayer/%1.lua").arg(m_script).toUtf8()); |
|
80 } |
76 |
81 |
77 switch (m_mapgen) |
82 switch (m_mapgen) |
78 { |
83 { |
79 case MAPGEN_MAZE: |
84 case MAPGEN_MAZE: |
80 SendIPC(QString("e$maze_size %1").arg(m_maze_size).toUtf8()); |
85 SendIPC(QString("e$maze_size %1").arg(m_maze_size).toUtf8()); |