From 304b6653e956f7f57ed937e8d3eada88a019b7c5 Mon Sep 17 00:00:00 2001 From: Titus Tscharntke Date: Tue, 4 May 2010 22:55:22 +0000 Subject: [PATCH] icons with colored frames default map startup size raised to 128x128 startup screensize raised to 1024x768 --- .../icons/brush_object_bush.xpm | 48 ++++++++-------- .../icons/brush_object_c1-bigtree.xpm | 50 +++++++++-------- .../icons/brush_object_c2-hanged.xpm | 56 ++++++++++--------- .../icons/brush_object_c3-statue.xpm | 52 ++++++++--------- .../icons/brush_object_c4-bigrock.xpm | 50 +++++++++-------- .../icons/brush_object_c5-blocking.xpm | 48 ++++++++-------- .../icons/brush_object_dead-tree.xpm | 46 +++++++-------- .../icons/brush_object_stone.xpm | 50 +++++++++-------- .../icons/brush_object_tree.xpm | 52 ++++++++--------- .../icons/brush_object_water-object.xpm | 50 +++++++++-------- .../icons/brush_resource_1-gold.xpm | 2 +- .../icons/brush_surface_custom.xpm | 2 +- .../icons/brush_surface_grass1.xpm | 2 +- .../icons/brush_surface_grass2.xpm | 2 +- source/glest_map_editor/main.cpp | 10 ++-- source/glest_map_editor/map.cpp | 2 +- 16 files changed, 271 insertions(+), 251 deletions(-) diff --git a/source/glest_map_editor/icons/brush_object_bush.xpm b/source/glest_map_editor/icons/brush_object_bush.xpm index 07bf9fbb0..ea066c672 100644 --- a/source/glest_map_editor/icons/brush_object_bush.xpm +++ b/source/glest_map_editor/icons/brush_object_bush.xpm @@ -1,25 +1,27 @@ /* XPM */ static const char *brush_object_bush[] = { -/* columns rows colors chars-per-pixel */ -"16 16 3 1", -" c #008000", -". c #00FF00", -"X c None", -/* pixels */ -"XXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXX", -"XXXXXX . X XXXXX", -"XXXXX . . ..XXXX", -"XXXXX. . . .XXXX", -"XXXX .X X X XXX", -"XXXX. . . X XXX", -"XXXX . X .. XXXX", -"XXXXX X . .XXXX", -"X X", -"XXXXXXXXXXXXXXXX" -}; +"20 20 4 1", +" c None", +". c #0000FF", +"+ c #008000", +"@ c #00FF00", +"....................", +"....................", +".. ..", +".. ..", +".. ..", +".. ..", +".. ..", +".. ..", +".. ..", +".. +@+ + ..", +".. +@+@+@@ ..", +".. @+@+@+@ ..", +".. +@ + + ++ ..", +".. @+@+@++ + ..", +".. +@+ +@@+ ..", +".. + +@++@ ..", +".. ++++++++++++++ ..", +".. ..", +"....................", +"...................."}; diff --git a/source/glest_map_editor/icons/brush_object_c1-bigtree.xpm b/source/glest_map_editor/icons/brush_object_c1-bigtree.xpm index fd1cbcd0f..bff2fdfd0 100644 --- a/source/glest_map_editor/icons/brush_object_c1-bigtree.xpm +++ b/source/glest_map_editor/icons/brush_object_c1-bigtree.xpm @@ -1,26 +1,28 @@ /* XPM */ static const char *brush_object_c1_bigtree[] = { -/* columns rows colors chars-per-pixel */ -"16 16 4 1", -" c #800000", -". c #008000", -"X c #808000", -"o c None", -/* pixels */ -"ooooooXX.Xoooooo", -"oooo.XXXXX.Xoooo", -"oooXXX.X.XXX.ooo", -"oooX.XX.XX.XXooo", -"ooXXXXXXXXXX.Xoo", -"ooX..X.XX...X.oo", -"oooXXXX.XXXXXooo", -"oooXX.XXX..X.ooo", -"ooooXXXX.XXXoooo", -"oooooo.XXXoooooo", -"oooooo oooooo", -"oooooo oooooo", -"oooooo oooooo", -"oooooo oooooo", -"ooooo ooooo", -"oooo ooo" -}; +"20 20 5 1", +" c None", +". c #FFCC7F", +"+ c #808000", +"@ c #008000", +"# c #800000", +"....................", +"....................", +".. ++@+ ..", +".. @+++++@+ ..", +".. +++@+@+++@ ..", +".. +@++@++@++ ..", +".. ++++++++++@+ ..", +".. +@@+@++@@@+@ ..", +".. ++++@+++++ ..", +".. ++@+++@@+@ ..", +".. ++++@+++ ..", +".. @+++ ..", +".. #### ..", +".. #### ..", +".. #### ..", +".. #### ..", +".. ###### ..", +".. ######### ..", +"....................", +"...................."}; diff --git a/source/glest_map_editor/icons/brush_object_c2-hanged.xpm b/source/glest_map_editor/icons/brush_object_c2-hanged.xpm index 1fdeabb92..4ca6e34f1 100644 --- a/source/glest_map_editor/icons/brush_object_c2-hanged.xpm +++ b/source/glest_map_editor/icons/brush_object_c2-hanged.xpm @@ -1,29 +1,31 @@ /* XPM */ static const char *brush_object_c2_hanged[] = { -/* columns rows colors chars-per-pixel */ -"16 16 7 1", -" c #800000", -". c #008000", -"X c #FFFF00", -"o c #0000FF", -"O c #808080", -"+ c #C0C0C0", -"@ c None", -/* pixels */ -"@@@@@@@ @@@@@@@@", -"@@@ @@@@", -"@@@+@ @ @ @+@@@@", -"@@OO@@ @@+@@@@", -"@@+++@@ @@OOO@@@", -"@+O+O+@ @O@+@O@@", -"@++O++@ @O +@O@@", -"@X+++X@ @O + O@@", -"@@oXo@@ @O + O@@", -"@@oXo@@ @O@+ O@@", -"@@+++@@ @OOO O @", -"@@+@+@@ @@@@ @ @", -"@@@@@@@ @@@@@@@@", -"@@@@@@@ @@@@@@@@", -"@@@@@@. O@@@@@@@", -"................" -}; +"20 20 8 1", +" c None", +". c #00FFFF", +"+ c #800000", +"@ c #C0C0C0", +"# c #808080", +"$ c #FFFF00", +"% c #0000FF", +"& c #008000", +"....................", +"....................", +".. + ..", +".. +++++++++ ..", +".. @ + + + @ ..", +".. ## +++ @ ..", +".. @@@ + ### ..", +".. @#@#@ + # @ # ..", +".. @@#@@ + #+@ # ..", +".. $@@@$ + #+@+# ..", +".. %$% + #+@+# ..", +".. %$% + # @+# ..", +".. @@@ + ###+#+ ..", +".. @ @ + + + ..", +".. + ..", +".. + ..", +".. &+# ..", +"..&&&&&&&&&&&&&&&&..", +"....................", +"...................."}; diff --git a/source/glest_map_editor/icons/brush_object_c3-statue.xpm b/source/glest_map_editor/icons/brush_object_c3-statue.xpm index 6838f7fc1..a3ffc9e6c 100644 --- a/source/glest_map_editor/icons/brush_object_c3-statue.xpm +++ b/source/glest_map_editor/icons/brush_object_c3-statue.xpm @@ -1,27 +1,29 @@ /* XPM */ static const char *brush_object_c3_statue[] = { -/* columns rows colors chars-per-pixel */ -"16 16 5 1", -" c #008000", -". c #808000", -"X c #808080", -"o c #C0C0C0", -"O c None", -/* pixels */ -"OOOOOOOOOOOOOOOO", -"OOOOOoOOOOOOOOOO", -"OOOOOOoXXOOOOOOO", -"OOOOOOOoXOOOOOOO", -"OOOOO...oXOOOOOO", -"OOOOO.o.XoXOOOOO", -"OOOOO...XOOOOOOO", -"OOOOOOXXXOOOOOOO", -"OOOOOOXXXOOOOOOO", -"OOOOOOXOXOOOOOOO", -"OOOOOOXOOXOOOOOO", -"OOOOOOXOOXOOOOOO", -"OOOOOooooooOOOOO", -"OOOOOOXXXXOOOOOO", -"OOOOOOXXXXOOOOOO", -" " -}; +"20 20 6 1", +" c None", +". c #B2194C", +"+ c #C0C0C0", +"@ c #808080", +"# c #808000", +"$ c #008000", +"....................", +"....................", +".. ..", +".. + ..", +".. +@@ ..", +".. +@ ..", +".. ###+@ ..", +".. #+#@+@ ..", +".. ###@ ..", +".. @@@ ..", +".. @@@ ..", +".. @ @ ..", +".. @ @ ..", +".. @ @ ..", +".. ++++++ ..", +".. @@@@ ..", +".. @@@@ ..", +"..$$$$$$$$$$$$$$$$..", +"....................", +"...................."}; diff --git a/source/glest_map_editor/icons/brush_object_c4-bigrock.xpm b/source/glest_map_editor/icons/brush_object_c4-bigrock.xpm index f199f3930..a327f9853 100644 --- a/source/glest_map_editor/icons/brush_object_c4-bigrock.xpm +++ b/source/glest_map_editor/icons/brush_object_c4-bigrock.xpm @@ -1,26 +1,28 @@ /* XPM */ static const char *brush_object_c4_bigrock[] = { -/* columns rows colors chars-per-pixel */ -"16 16 4 1", -" c #008000", -". c #808080", -"X c #C0C0C0", -"o c None", -/* pixels */ -"oooooooooooooooo", -"oooooooooooooooo", -"oooooooooooooooo", -"ooooo.Xooooooooo", -"ooooX...ooo.Xooo", -"oooo...X ..ooo", -"oooo.X.X ..ooo", -"oooX....X .ooo", -"ooo..X.X. .Xoo", -"ooo.. ... ..oo", -"ooo.X ....X..oo", -"ooX.. .X..X.Xoo", -"oo.... .. ..oo", -"oo.X...... oo", -"oo..... ....oo", -" " -}; +"20 20 5 1", +" c None", +". c #7fff19", +"+ c #808080", +"@ c #C0C0C0", +"# c #008000", +"....................", +"....................", +".. ..", +".. ..", +".. ..", +".. +@ ..", +".. @+++ +@ ..", +".. +++@###++ ..", +".. +@+@###++ ..", +".. @++++@###+ ..", +".. ++@+@+###+@ ..", +".. ++##+++##++ ..", +".. +@##++++@++ ..", +".. @++##+@++@+@ ..", +".. ++++#++###++ ..", +".. +@++++++#### ..", +".. +++++###++++ ..", +"..################..", +"....................", +"...................."}; diff --git a/source/glest_map_editor/icons/brush_object_c5-blocking.xpm b/source/glest_map_editor/icons/brush_object_c5-blocking.xpm index 69afeabbc..7ff90ee6c 100644 --- a/source/glest_map_editor/icons/brush_object_c5-blocking.xpm +++ b/source/glest_map_editor/icons/brush_object_c5-blocking.xpm @@ -1,25 +1,27 @@ /* XPM */ static const char *brush_object_c5_blocking[] = { -/* columns rows colors chars-per-pixel */ -"16 16 3 1", -" c #008000", -". c #C0C0C0", -"X c None", -/* pixels */ -"XXXXXXXXXXXXXXXX", -"XX............XX", -"XX.XXXXXXXXXX.XX", -"XX.XXXXXXXXXX.XX", -"XX.XXXXXXXXXX.XX", -"XX.XXXXXXXXXX.XX", -"XX.XXXXXXXXXX.XX", -"XX.XXXXXXXXXX.XX", -"XX.XXXXXXXXXX.XX", -"XX.XXXXXXXXXX.XX", -"XX.XXXXXXXXXX.XX", -"XX.XXXXXXXXXX.XX", -"XX.XXXXXXXXXX.XX", -"XX.XXXXXXXXXX.XX", -"XX.XXXXXXXXXX.XX", -" " -}; +"20 20 4 1", +" c None", +". c #FF33CC", +"+ c #C0C0C0", +"@ c #008000", +"....................", +"....................", +".. ..", +".. ++++++++++++ ..", +".. + + ..", +".. + + ..", +".. + + ..", +".. + + ..", +".. + + ..", +".. + + ..", +".. + + ..", +".. + + ..", +".. + + ..", +".. + + ..", +".. + + ..", +".. + + ..", +".. + + ..", +"..@@@@@@@@@@@@@@@@..", +"....................", +"...................."}; diff --git a/source/glest_map_editor/icons/brush_object_dead-tree.xpm b/source/glest_map_editor/icons/brush_object_dead-tree.xpm index 7c37083c2..e2f9d6894 100644 --- a/source/glest_map_editor/icons/brush_object_dead-tree.xpm +++ b/source/glest_map_editor/icons/brush_object_dead-tree.xpm @@ -1,24 +1,26 @@ /* XPM */ static const char *brush_object_dead_tree[] = { -/* columns rows colors chars-per-pixel */ -"16 16 2 1", -" c #800000", -". c None", -/* pixels */ -"................", -".. .. ..........", -"... . ... . ....", -".... ..... ....", -".. .. .. . ..", -"..... ... ...", -"... .. .. ...", -"... .. ... ..", -".. .. ......", -"..... .. ..", -"...... ....", -"...... ......", -"...... ......", -"...... ......", -"..... .....", -".... ..." -}; +"20 20 3 1", +" c None", +". c #FFFFFF", +"+ c #800000", +"....................", +"....................", +".. ..", +".. + + ..", +".. + + + + ..", +".. + ++ ..", +".. ++++ + + + ..", +".. +++ ++ ..", +".. + ++ +++ ..", +".. + ++++ + ..", +".. +++ +++ ..", +".. +++++ ++ ..", +".. ++++++ ..", +".. ++++ ..", +".. ++++ ..", +".. ++++ ..", +".. ++++++ ..", +".. +++++++++ ..", +"....................", +"...................."}; diff --git a/source/glest_map_editor/icons/brush_object_stone.xpm b/source/glest_map_editor/icons/brush_object_stone.xpm index e1512ce35..0d68903bb 100644 --- a/source/glest_map_editor/icons/brush_object_stone.xpm +++ b/source/glest_map_editor/icons/brush_object_stone.xpm @@ -1,26 +1,28 @@ /* XPM */ static const char *brush_object_stone[] = { -/* columns rows colors chars-per-pixel */ -"16 16 4 1", -" c #008000", -". c #808080", -"X c #C0C0C0", -"o c None", -/* pixels */ -"oooooooooooooooo", -"oooooooooooooooo", -"oooooooooooooooo", -"oooooooooooooooo", -"oooooooooooooooo", -"oooooooooooooooo", -"oooooooooooooooo", -"oooo.Xoooooooooo", -"ooo...X..ooooooo", -"oooX....X.Xooooo", -"oo.........Xoooo", -"oo...X.....XXooo", -"ooo......X..XXoo", -"ooo.X........Xoo", -"o o", -"oooooooooooooooo" -}; +"20 20 5 1", +" c None", +". c #7F7FFF", +"+ c #808080", +"@ c #C0C0C0", +"# c #008000", +"....................", +"....................", +".. ..", +".. ..", +".. ..", +".. ..", +".. ..", +".. ..", +".. ..", +".. +@ ..", +".. +++@++ ..", +".. @++++@+@ ..", +".. +++++++++@ ..", +".. +++@+++++@@ ..", +".. ++++++@++@@ ..", +".. +@++++++++@ ..", +".. ############## ..", +".. ..", +"....................", +"...................."}; diff --git a/source/glest_map_editor/icons/brush_object_tree.xpm b/source/glest_map_editor/icons/brush_object_tree.xpm index bcee98116..db5e9f1b5 100644 --- a/source/glest_map_editor/icons/brush_object_tree.xpm +++ b/source/glest_map_editor/icons/brush_object_tree.xpm @@ -1,26 +1,28 @@ /* XPM */ -static const char *brush_object_tree[] = { -/* columns rows colors chars-per-pixel */ -"16 16 4 1", -" c #800000", -". c #008000", -"X c #00FF00", -"o c None", -/* pixels */ -"ooooooo..ooooooo", -"ooooo......ooooo", -"oooo....X...oooo", -"oooo........oooo", -"ooo.X..XX..X.ooo", -"ooo......X...ooo", -"oooo...X....oooo", -"oooo........oooo", -"ooooo......ooooo", -"oooooo .. oooooo", -"oooooo oooooo", -"oooooo oooooo", -"oooooo oooooo", -"oooooo oooooo", -"ooooo ooooo", -"oooo ooo" -}; +static const char * brush_object_tree[] = { +"20 20 5 1", +" c None", +". c #FF0000", +"+ c #008000", +"@ c #00FF00", +"# c #800000", +"....................", +"....................", +".. ++ ..", +".. ++++++ ..", +".. ++++@+++ ..", +".. ++++++++ ..", +".. +@++@@++@+ ..", +".. ++++++@+++ ..", +".. +++@++++ ..", +".. ++++++++ ..", +".. ++++++ ..", +".. #++# ..", +".. #### ..", +".. #### ..", +".. #### ..", +".. #### ..", +".. ###### ..", +".. ######### ..", +"....................", +"...................."}; diff --git a/source/glest_map_editor/icons/brush_object_water-object.xpm b/source/glest_map_editor/icons/brush_object_water-object.xpm index c792e081d..87630eee1 100644 --- a/source/glest_map_editor/icons/brush_object_water-object.xpm +++ b/source/glest_map_editor/icons/brush_object_water-object.xpm @@ -1,26 +1,28 @@ /* XPM */ static const char *brush_object_water_object[] = { -/* columns rows colors chars-per-pixel */ -"16 16 4 1", -" c #008000", -". c #0000FF", -"X c #00FFFF", -"o c None", -/* pixels */ -"oooooooooooooooo", -"oooooooooooooooo", -"oooooooooooooooo", -"oooooooooooooooo", -"oooooooooooooooo", -"oooooooooooooooo", -"ooooooo oooooooo", -"ooooooo ooo oooo", -"ooooo o o o oooo", -"ooooo o o ooooo", -"ooooo oo o ooooo", -"oooooo o oooooo", -"XXXXXXX XXXXXXX", -"X.XXX.XXX.XXX.XX", -".X.X.X.X.X.X.X.X", -"................" -}; +"20 20 5 1", +" c None", +". c #7F7F7F", +"+ c #008000", +"@ c #00FFFF", +"# c #0000FF", +"....................", +"....................", +".. ..", +".. ..", +".. ..", +".. ..", +".. ..", +".. ..", +".. + ..", +".. + + ..", +".. + + + + ..", +".. + ++ + ..", +".. + + + ..", +".. + ++ ..", +"..@@@@@@@++@@@@@@@..", +"..@#@@@#@@@#@@@#@@..", +"..#@#@#@#@#@#@#@#@..", +"..################..", +"....................", +"...................."}; diff --git a/source/glest_map_editor/icons/brush_resource_1-gold.xpm b/source/glest_map_editor/icons/brush_resource_1-gold.xpm index bd0e20f0a..f126291ea 100644 --- a/source/glest_map_editor/icons/brush_resource_1-gold.xpm +++ b/source/glest_map_editor/icons/brush_resource_1-gold.xpm @@ -2,7 +2,7 @@ static const char *brush_resource_1_gold[] = { /* columns rows colors chars-per-pixel */ "16 16 2 1", -" c #808000", +" c #dddd00", ". c None", /* pixels */ "................", diff --git a/source/glest_map_editor/icons/brush_surface_custom.xpm b/source/glest_map_editor/icons/brush_surface_custom.xpm index 43561ea22..a7e5a81d6 100644 --- a/source/glest_map_editor/icons/brush_surface_custom.xpm +++ b/source/glest_map_editor/icons/brush_surface_custom.xpm @@ -3,7 +3,7 @@ static const char *brush_surface_custom[] = { /* columns rows colors chars-per-pixel */ "16 16 3 1", " c #000000", -". c #808000", +". c #7c4645", "X c None", /* pixels */ "XXXXXXXXXXXXXXXX", diff --git a/source/glest_map_editor/icons/brush_surface_grass1.xpm b/source/glest_map_editor/icons/brush_surface_grass1.xpm index cd8be4986..45749f152 100644 --- a/source/glest_map_editor/icons/brush_surface_grass1.xpm +++ b/source/glest_map_editor/icons/brush_surface_grass1.xpm @@ -3,7 +3,7 @@ static const char *brush_surface_grass1[] = { /* columns rows colors chars-per-pixel */ "16 16 3 1", " c #000000", -". c #00FF00", +". c #00a000", "X c None", /* pixels */ "XXXXXXXXXXXXXXXX", diff --git a/source/glest_map_editor/icons/brush_surface_grass2.xpm b/source/glest_map_editor/icons/brush_surface_grass2.xpm index 798bc2c40..c0f97597f 100644 --- a/source/glest_map_editor/icons/brush_surface_grass2.xpm +++ b/source/glest_map_editor/icons/brush_surface_grass2.xpm @@ -3,7 +3,7 @@ static const char *brush_surface_grass2[] = { /* columns rows colors chars-per-pixel */ "16 16 3 1", " c #000000", -". c #008000", +". c #536e0b", "X c None", /* pixels */ "XXXXXXXXXXXXXXXX", diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp index 46c5f5b2b..a1a39a823 100755 --- a/source/glest_map_editor/main.cpp +++ b/source/glest_map_editor/main.cpp @@ -42,7 +42,7 @@ wxString ToUnicode(const string& str) { // =============================================== MainWindow::MainWindow() - : wxFrame(NULL, -1, ToUnicode(winHeader), wxDefaultPosition, wxSize(800, 600)) + : wxFrame(NULL, -1, ToUnicode(winHeader), wxDefaultPosition, wxSize(1024, 768)) , lastX(0), lastY(0) , currentBrush(btHeight) , height(0) @@ -475,8 +475,8 @@ void MainWindow::onMenuEditReset(wxCommandEvent &event) { SimpleDialog simpleDialog; simpleDialog.addValue("Altitude", "10"); simpleDialog.addValue("Surface", "1"); - simpleDialog.addValue("Width", "64"); - simpleDialog.addValue("Height", "64"); + simpleDialog.addValue("Width", "128"); + simpleDialog.addValue("Height", "128"); simpleDialog.show(); try { @@ -510,8 +510,8 @@ void MainWindow::onMenuEditResize(wxCommandEvent &event) { SimpleDialog simpleDialog; simpleDialog.addValue("Altitude", "10"); simpleDialog.addValue("Surface", "1"); - simpleDialog.addValue("Height", "64"); - simpleDialog.addValue("Width", "64"); + simpleDialog.addValue("Height", "128"); + simpleDialog.addValue("Width", "128"); simpleDialog.show(); try { diff --git a/source/glest_map_editor/map.cpp b/source/glest_map_editor/map.cpp index 7c7180aab..dbf228723 100644 --- a/source/glest_map_editor/map.cpp +++ b/source/glest_map_editor/map.cpp @@ -31,7 +31,7 @@ Map::Map() { waterLevel = 4; cells = NULL; startLocations = NULL; - reset(64, 64, 10.f, 1); + reset(128, 128, 10.f, 1); resetFactions(8); title = ""; desc = "";