Skip to content

Construct SimSprite and initialize pointer members #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jquast wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Construct SimSprite and initialize pointer members #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/micropolis-engine/src/micropolis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ class Micropolis {
/**
* Callback interface.
*/
Callback *callback;
Callback *callback = NULL;


/**
Expand Down Expand Up @@ -1411,8 +1411,8 @@ class Micropolis {
/**
* Memory for map array.
*/
unsigned short *mapBase;
unsigned short *mopBase;
unsigned short *mapBase = NULL;
unsigned short *mopBase = NULL;


void initMapArrays();
Expand Down
4 changes: 4 additions & 0 deletions packages/micropolis-engine/src/sprite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@
////////////////////////////////////////////////////////////////////////


#include <new>

#include "micropolis.h"
#include "text.h"

Expand Down Expand Up @@ -112,6 +114,8 @@ SimSprite *Micropolis::newSprite(const std::string &name, int type, int x, int y
freeSprites = sprite->next;
} else {
sprite = (SimSprite *)newPtr(sizeof (SimSprite));
// newPtr is malloc, so construct the object in place.
new (sprite) SimSprite();
}

sprite->name = name;
Expand Down