mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-10-31 19:36:16 +00:00
changed some shmup:: to multi::
This commit is contained in:
parent
848eb8f48b
commit
f934943732
@ -492,7 +492,7 @@ EX void handleKeyNormal(int sym, int uni) {
|
||||
if(sym == '-' || sym == PSEUDOKEY_WHEELDOWN) {
|
||||
actonrelease = false;
|
||||
|
||||
shmup::cpid = 0;
|
||||
multi::cpid = 0;
|
||||
if(mouseover &&
|
||||
targetclick && (!shmup::on || numplayers() == 1) && targetRangedOrb(mouseover, forcetarget ? roMouseForce : roMouse)) {
|
||||
}
|
||||
|
14
graph.cpp
14
graph.cpp
@ -2839,7 +2839,7 @@ bool drawMonster(const transmatrix& Vparam, int ct, cell *c, color_t col, bool m
|
||||
else {
|
||||
if(mirr) Vs = Vs * Mirror;
|
||||
}
|
||||
shmup::cpid = i;
|
||||
multi::cpid = i;
|
||||
|
||||
drawPlayerEffects(Vs, c, true);
|
||||
if(!mmmon) return true;
|
||||
@ -7048,7 +7048,7 @@ EX void drawMarkers() {
|
||||
orbToTarget = itNone;
|
||||
|
||||
if(mouseover && targetclick) {
|
||||
shmup::cpid = 0;
|
||||
multi::cpid = 0;
|
||||
orbToTarget = targetRangedOrb(mouseover, roCheck);
|
||||
#if CAP_QUEUE
|
||||
if(orbToTarget == itOrbSummon) {
|
||||
@ -7416,8 +7416,8 @@ EX void drawthemap() {
|
||||
drawFlashes();
|
||||
|
||||
if(multi::players > 1 && !shmup::on) {
|
||||
if(shmup::centerplayer != -1)
|
||||
cwtV = multi::whereis[shmup::centerplayer];
|
||||
if(multi::centerplayer != -1)
|
||||
cwtV = multi::whereis[multi::centerplayer];
|
||||
else {
|
||||
hyperpoint h;
|
||||
for(int i=0; i<3; i++) h[i] = 0;
|
||||
@ -7431,10 +7431,10 @@ EX void drawthemap() {
|
||||
}
|
||||
|
||||
if(shmup::on) {
|
||||
if(shmup::players == 1)
|
||||
if(multi::players == 1)
|
||||
cwtV = shmup::pc[0]->pat;
|
||||
else if(shmup::centerplayer != -1)
|
||||
cwtV = shmup::pc[shmup::centerplayer]->pat;
|
||||
else if(multi::centerplayer != -1)
|
||||
cwtV = shmup::pc[multi::centerplayer]->pat;
|
||||
else {
|
||||
hyperpoint h;
|
||||
for(int i=0; i<3; i++) h[i] = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user