~kxq/widelands/feature-978-partial-training

« back to all changes in this revision

Viewing changes to src/graphic/texture.cc

Committer: Teppo Maenpaa \
Date: 2013-05-25 06:30:05 UTC
mfrom: (6560.1.9 trunk)
Revision ID: tm@iki.fi-20130525063005-2ux5rgkpufaedeiv

Merged with changes from trunk.

files modified:
pics/big.png

pics/medium.png

pics/mine.png

pics/port.png

pics/set_flag.png

pics/small.png

src/campvis.cc

src/economy/cmd_call_economy_balance.h

src/economy/economy.cc

src/economy/economy.h

src/economy/economy_data_packet.h

src/economy/flag.h

src/economy/fleet.cc

src/economy/fleet.h

src/economy/idleworkersupply.h

src/economy/request.cc

src/economy/request.h

src/economy/shippingitem.h

src/economy/ware_instance.h

src/economy/wares_queue.h

src/editor/tools/editor_decrease_height_tool.cc

src/editor/tools/editor_set_height_tool.cc

src/game_io/game_map_data_packet.cc

src/graphic/rendertarget.cc

src/graphic/rendertarget.h

src/graphic/richtext.cc

src/graphic/text/rt_errors.h

src/graphic/text/rt_render.cc

src/graphic/texture.cc

src/io/basic_filewrite.h

src/logic/building.cc

src/logic/field.h

src/logic/immovable.h

src/logic/instances.h

src/logic/map.cc

src/logic/map.h

src/logic/message_id.h

src/logic/message_queue.h

src/logic/player.h

src/logic/production_program.h

src/logic/productionsite.h

src/logic/replay.cc

src/logic/ship.h

src/logic/tribe.h

src/logic/widelands.h

src/logic/widelands_geometry.h

src/map_generator.cc

src/map_io/widelands_map_port_spaces_data_packet.cc

src/map_io/widelands_map_scripting_data_packet.cc

src/network/netclient.cc

src/scripting/lua_map.cc

txts/developers

Show diffs side-by-side

added added

removed removed

src/graphic/texture.cc

175

SDL_Surface * const cv = SDL_ConvertSurface(surf, &fmt, 0);

176

177

// Add the frame

178

m_pixels =

178

uint8_t* new_ptr =

179

static_cast<uint8_t *>

180

(realloc

181

(m_pixels, TEXTURE_WIDTH * TEXTURE_HEIGHT * (m_nrframes + 1)));

182

if (!new_ptr)

183

throw wexception("Out of memory.");

184

m_pixels = new_ptr;

185

186

182

187

m_curframe = &m_pixels[TEXTURE_WIDTH * TEXTURE_HEIGHT * m_nrframes];

183

188

++m_nrframes;

184

189

Older »