john
/
McRogueFace
1
0
Fork 0
Code Issues 52 Pull Requests Projects 1 Releases Wiki Activity

(minor) sprite object enabled in collection

This commit is contained in:
John McCardle 2023-10-20 22:23:20 -04:00
parent 494658e5c3
commit f2eaee95ec
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Resources.h
View File

@ -1,3 +1,4 @@
#pragma once
#include "Common.h" #include "Common.h"
#include <list> #include <list>
#include "UI.h" #include "UI.h"
@ -9,4 +10,4 @@ class Resources
public: public:
static sf::Font font; static sf::Font font;
static GameEngine* game; static GameEngine* game;
}; };

14
src/UI.h
View File

@ -1281,8 +1281,10 @@ switch (target->derived_type()) \
// this would be a great use case for .tp_base // this would be a great use case for .tp_base
if (!PyObject_IsInstance(o, (PyObject*)&PyUIFrameType) && if (!PyObject_IsInstance(o, (PyObject*)&PyUIFrameType) &&
//!PyObject_IsInstance(o, (PyObject*)&PyUISpriteType) && !PyObject_IsInstance(o, (PyObject*)&PyUISpriteType) &&
!PyObject_IsInstance(o, (PyObject*)&PyUICaptionType)) !PyObject_IsInstance(o, (PyObject*)&PyUICaptionType) // &&
//!PyObject_IsInstance(o, (PyObject*)&PyUIGridType)
)
{ {
PyErr_SetString(PyExc_TypeError, "Only Frame, Caption, Sprite, and Grid objects can be added to UICollection"); PyErr_SetString(PyExc_TypeError, "Only Frame, Caption, Sprite, and Grid objects can be added to UICollection");
return NULL; return NULL;
@ -1298,9 +1300,11 @@ switch (target->derived_type()) \
PyUICaptionObject* caption = (PyUICaptionObject*)o; PyUICaptionObject* caption = (PyUICaptionObject*)o;
self->data->push_back(caption->data); self->data->push_back(caption->data);
} }
//if (PyObject_IsInstance(o, (PyObject*)&PyUISpriteType)) if (PyObject_IsInstance(o, (PyObject*)&PyUISpriteType))
//{ {
//} PyUISpriteObject* sprite = (PyUISpriteObject*)o;
self->data->push_back(sprite->data);
}
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;