diff --git a/osx/boe.graphutil.cpp b/osx/boe.graphutil.cpp index 623389c3..cc5b923a 100644 --- a/osx/boe.graphutil.cpp +++ b/osx/boe.graphutil.cpp @@ -399,7 +399,7 @@ void draw_items(location where){ from_rect = get_item_template_rect(univ.town.items[i].graphic_num); to_rect = coord_to_rect(where_draw.x,where_draw.y); terrain_there[where_draw.x][where_draw.y] = -1; - if(univ.town.items[i].graphic_num >= 45) { + if(univ.town.items[i].graphic_num >= 55) { to_rect.inset(5,9); rect_draw_some_item(tiny_obj_gworld, from_rect, terrain_screen_gworld, to_rect,sf::BlendAlpha); }else diff --git a/osx/boe.newgraph.cpp b/osx/boe.newgraph.cpp index f309a908..09d77eb9 100644 --- a/osx/boe.newgraph.cpp +++ b/osx/boe.newgraph.cpp @@ -722,7 +722,7 @@ void click_shop_rect(RECT area_rect) static graf_pos calc_item_rect(int num,RECT& to_rect) { RECT from_rect = {0,0,18,18}; sf::Texture *from_gw = &tiny_obj_gworld; - if (num < 45) { + if (num < 55) { from_gw = &items_gworld; from_rect = calc_rect(num % 5, num / 5); }else{ diff --git a/osx/classes/item.cpp b/osx/classes/item.cpp index ed62ca49..ab2dcf4f 100644 --- a/osx/classes/item.cpp +++ b/osx/classes/item.cpp @@ -155,7 +155,7 @@ cItemRec::cItemRec(long preset){ charges = 0; type = eWeapType::EDGED; magic_use_type = 0; - graphic_num = 45; + graphic_num = 55; value = 2; weight = 7; full_name = "Bronze Knife"; @@ -171,7 +171,7 @@ cItemRec::cItemRec(long preset){ charges = 0; type = eWeapType::NOT_MELEE; magic_use_type = 0; - graphic_num = 65; + graphic_num = 75; value = 2; weight = 20; full_name = "Crude Buckler"; @@ -203,7 +203,7 @@ cItemRec::cItemRec(long preset){ charges = 12; type = eWeapType::NOT_MELEE; magic_use_type = 0; - graphic_num = 47; + graphic_num = 57; value = 1; weight = 1; full_name = "Arrows"; @@ -235,7 +235,7 @@ cItemRec::cItemRec(long preset){ charges = 0; type = eWeapType::NOT_MELEE; magic_use_type = 0; - graphic_num = 66; + graphic_num = 76; value = 6; weight = 15; full_name = "Leather Helm"; @@ -251,7 +251,7 @@ cItemRec::cItemRec(long preset){ charges = 0; type = eWeapType::NOT_MELEE; magic_use_type = 0; - graphic_num = 62; + graphic_num = 72; value = 0; weight = 0; full_name = "Food"; @@ -267,7 +267,7 @@ cItemRec::cItemRec(long preset){ charges = 0; type = eWeapType::NOT_MELEE; magic_use_type = 0; - graphic_num = 53; + graphic_num = 63; value = 0; weight = 0; full_name = ""; @@ -283,7 +283,7 @@ cItemRec::cItemRec(long preset){ charges = 1; type = eWeapType::NOT_MELEE; magic_use_type = 0; - graphic_num = 50; + graphic_num = 60; value = 0; weight = 8; full_name = "Potion"; @@ -307,7 +307,9 @@ cItemRec& cItemRec::operator = (legacy::item_record_type& old){ if(graphic_num >= 150) // custom item graphic graphic_num += 850; else if(graphic_num == 59) // duplicate mushroom graphic - graphic_num = 64; + graphic_num = 74; + else if(graphic_num >= 45) // small graphics were moved up to make a bit more room for new large graphics + graphic_num += 10; ability = (eItemAbil) old.ability; ability_strength = old.ability_strength; type_flag = old.type_flag; diff --git a/osx/dialogxml/pict.cpp b/osx/dialogxml/pict.cpp index e7e6aa77..b203decb 100644 --- a/osx/dialogxml/pict.cpp +++ b/osx/dialogxml/pict.cpp @@ -776,7 +776,7 @@ void cPict::drawPresetItem(short num, RECT to_rect){ fill_rect(*inWindow, to_rect, sf::Color::Black); std::shared_ptr from_gw; RECT from_rect = {0,0,18,18}; - if (num < 45) { + if (num < 55) { from_gw = getSheet(SHEET_ITEM); from_rect = calc_rect(num % 5, num / 5); }else{ diff --git a/rsrc/graphics.exd/mac/objects.png b/rsrc/graphics.exd/mac/objects.png index b5cfeec0..febde080 100644 Binary files a/rsrc/graphics.exd/mac/objects.png and b/rsrc/graphics.exd/mac/objects.png differ diff --git a/rsrc/graphics.exd/mac/tinyobj.png b/rsrc/graphics.exd/mac/tinyobj.png index b86b4446..efd088cf 100644 Binary files a/rsrc/graphics.exd/mac/tinyobj.png and b/rsrc/graphics.exd/mac/tinyobj.png differ