Attachment #82631 for bug #119425

Lines 44-51 Link Here

(-)./src/tool/resource_manager.h.orig (-2 / +2 lines)
44	std::string filename;	44	std::string filename;
45	std::string relative_path;	45	std::string relative_path;
46		46
47	Profile::Profile();	47	Profile();
48	Profile::~Profile();	48	~Profile();
49		49
50	};	50	};
51		51

Lines 38-44 Link Here

(-)./src/weapon/lowgrav.h.orig (-1 / +1 lines)
38	void HandleKeyEvent(int action, int event_type);	38	void HandleKeyEvent(int action, int event_type);
39	bool p_Shoot();	39	bool p_Shoot();
40	void SignalTurnEnd();	40	void SignalTurnEnd();
41	void LowGrav::Draw();	41	void Draw();
42	};	42	};
43		43
44	extern LowGrav lowgrav;	44	extern LowGrav lowgrav;




void ParticleEngine::Refresh()
{
  // remove old particles 
  std::list<Particle *>::iterator it=particles.begin(), end=particles.end(), current;
  while (it != end) {
    current = it;
    ++it;


void ParticleEngine::Draw()
{
  std::list<Particle *>::iterator it;
  // draw the particles
  for(it=particles.begin(); it!=particles.end(); ++it) {
    (*it)->Draw();

void ParticleEngine::Stop()
{
  // remove all the particles 
  std::list<Particle *>::iterator it=particles.begin(), end=particles.end(), current;
  while (it != end) {
    current = it;
    ++it;

Return to bug 119425

Lines 228-234 Link Here

(-)src/object/particle.cpp.orig (-3 / +3 lines)
228	void ParticleEngine::Refresh()	228	void ParticleEngine::Refresh()
229	{	229	{
230	// remove old particles	230	// remove old particles
231	std::list<Particle *>::iterator it=particles.begin(), end=particles.end(), current=NULL;	231	std::list<Particle *>::iterator it=particles.begin(), end=particles.end(), current;
232	while (it != end) {	232	while (it != end) {
233	current = it;	233	current = it;
234	++it;	234	++it;
Lines 307-313 Link Here
307		307
308	void ParticleEngine::Draw()	308	void ParticleEngine::Draw()
309	{	309	{
310	std::list<Particle *>::iterator it=NULL;	310	std::list<Particle *>::iterator it;
311	// draw the particles	311	// draw the particles
312	for(it=particles.begin(); it!=particles.end(); ++it) {	312	for(it=particles.begin(); it!=particles.end(); ++it) {
313	(*it)->Draw();	313	(*it)->Draw();
Lines 320-326 Link Here
320	void ParticleEngine::Stop()	320	void ParticleEngine::Stop()
321	{	321	{
322	// remove all the particles	322	// remove all the particles
323	std::list<Particle *>::iterator it=particles.begin(), end=particles.end(), current=NULL;	323	std::list<Particle *>::iterator it=particles.begin(), end=particles.end(), current;
324	while (it != end) {	324	while (it != end) {
325	current = it;	325	current = it;
326	++it;	326	++it;