JailDoctor/thepool
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 6 Wiki Activity

- Arreglats un milló de warnings tontos (i alguno serio)

Browse Source
This commit is contained in:
Raimon Zamora
2024-10-03 13:40:54 +02:00
parent b44ba3517a
commit 9ca1e59f44
11 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/m_editor_templates.cpp
View File

@@ -104,9 +104,9 @@ namespace modules
int i = 0;
auto actors = actor::templates::getByCategory(categories[current_category].c_str());
if (input::keyPressed(SDL_SCANCODE_X) && (hovered_actor < actors.size())) strcpy(actor_cut, actors[hovered_actor].name);
if (input::keyPressed(SDL_SCANCODE_X) && (hovered_actor < (int)actors.size())) strcpy(actor_cut, actors[hovered_actor].name);
if (input::keyPressed(SDL_SCANCODE_W) && (hovered_actor < actors.size()) && actor_cut[0]!=0)
if (input::keyPressed(SDL_SCANCODE_W) && (hovered_actor < (int)actors.size()) && actor_cut[0]!=0)
{
actor::actor_t *act = actor::templates::getByName(actor_cut);
actor::actor_t *other = actor::templates::getByName(actors[hovered_actor].name);
@@ -135,12 +135,12 @@ namespace modules
current_category += input::mouseWheel();
if (current_category < 0) current_category = categories.size()-1;
if (current_category >= categories.size()) current_category = 0;
if (current_category >= (int)categories.size()) current_category = 0;
if (input::mouseClk(1))
{
if (input::mouseY()>12) {
if (hovered_actor<=actors.size()) {
if (hovered_actor <= (int)actors.size()) {
actor::actor_t *new_act = actor::duplicate(&actors[hovered_actor]);
actor::setUniqueName(new_act);
actor::setDirty(new_act, true);
@@ -156,7 +156,7 @@ namespace modules
init_text_edit();
} else {
int clicked_category = (input::mouseX()-11)/40;
if (clicked_category<categories.size())
if (clicked_category < (int)categories.size())
{
if (input::keyDown(SDL_SCANCODE_LCTRL))
{
@@ -171,7 +171,7 @@ namespace modules
else if (input::mouseClk(3))
{
if (input::mouseX()>12) {
if (hovered_actor<=actors.size()) {
if (hovered_actor <= (int)actors.size()) {
actor_edited = actor::templates::getByName(actors[hovered_actor].name);
edit_mode = EDITING_ACTOR_NAME;
init_text_edit();