From 31c0d29bc2512c5ca7c865fb265ec58399190753 Mon Sep 17 00:00:00 2001 From: Lucas GAUTHERON Date: Sat, 2 Mar 2013 15:04:23 +0000 Subject: [PATCH] minor code "fixes" git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7276 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/editing.cpp | 17 ++++++++--------- source/src/renderhud.cpp | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/source/src/editing.cpp b/source/src/editing.cpp index 9a326b9d..21ce8fc5 100644 --- a/source/src/editing.cpp +++ b/source/src/editing.cpp @@ -347,22 +347,21 @@ void editdrag(bool isdown) lasty = cy; lasth = ch; tofronttex(); - - extern vector keyms; - vector elems; bool ctrlpressed = false; if (identexists("newselkeys")) { - for (int i = 0; i < keyms.length(); i++) - if(keyms[i].pressed) + extern vector keyms; + vector elems; + explodelist(getalias("newselkeys"), elems); + + loopi(keyms.length()) if(keyms[i].pressed) loopj(elems.length()) { - explodelist(getalias("newselkeys"), elems); - for (int j = 0; j < elems.length(); j++) + if (strcmp(keyms[i].name, elems[j]) == 0) { - if (strcmp(keyms[i].name, elems[j]) == 0) - { ctrlpressed = true; break; } + ctrlpressed = true; + break; } } } diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index 6efb5af6..7783d8dc 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -1051,7 +1051,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat glPushMatrix(); glOrtho(0, VIRTW, VIRTH, 0, -1, 1); glScalef(0.8, 0.8, 1); - draw_textf("Speed: %.2f", VIRTW/2, VIRTH, sqrtf(p->vel.x*p->vel.x + p->vel.y*p->vel.y)); + draw_textf("Speed: %.2f", VIRTW/2, VIRTH, p->vel.magnitudexy()); glPopMatrix(); }