search

comp380team3 / PuzzlePathDimension

Class project for COMP 380 at California State University, Northridge
0 stars 0 forks source link

Having trouble integrating the new menu system w/ the rest of the game #23

Closed ghost closed 11 years ago

ghost commented 11 years ago

Having trouble understanding where in the architecture the menu system fits in. We have not really tried to modify anything for the integration. We did not want to break the code that exists.

What we have so far is in the branch named michael_new_menu. Can someone take a look at it?

-- Michael and Jorenz

Twisol commented 11 years ago

I'll take a look.

Twisol commented 11 years ago

I pushed up my progress into the same branch. Here's a diff of my changes.. The problem now is that the other game states aren't accessible. Some more plumbing will be necessary so that the menu screens can push onto the outer game state stack.

I'm considering just throwing out the state-vs-menu distinction and lifting everything into the same state stack. The GameScreen code provides for a lot more than my GameState anyway.

ghost commented 11 years ago

Yeah, ok. I can see what you mean. Let me know what you decide. Jorenz and I were discussing this as well. We did not know exactly what to do, so we left it alone.

Twisol commented 11 years ago

I'll probably work on cleaning this up once i have the level loader working (which should be soon).

Twisol commented 11 years ago

Alright, I think it's pretty much all merged in. I also moved the code from the SimulationState into GameplayState and removed the existing GameStates.

Twisol commented 11 years ago

If there are no objections, I'm going to merge this in shortly. A lot of things are likely to depend on the (extensive) changes in this branch.

Jjp137 commented 11 years ago

I checked out the code briefly, and it seems stable to me. The template's pause menu does seem to be missing, but we'll probably replace it soon enough.

(Nitpick note: how do you unfold #regions by default? I don't like them gah)

Twisol commented 11 years ago

Apparently you can use Ctrl+M+L, but you need a macro to make that the default. Wat.

EDIT: Or just go to Tools -> Options -> Text Editor -> C# -> Advanced and disable outlining mode.

ghost commented 11 years ago

Would it be okay if I start using the code that has been merge or should I wait?

Jjp137 commented 11 years ago

@Twisol Alrighty, thanks. :) As for the issue itself, I have nothing more to say :p

EDIT: edited again b/c stuff

Twisol commented 11 years ago

@mike72 Go for it. I'll step back from the michael_new_menu branch now. (I'll probably merge it into master rather soon, either way.)

Twisol commented 11 years ago

Merged into master.