~ubuntu-branches/ubuntu/trusty/enigma/trusty-proposed

« back to all changes in this revision

Viewing changes to src/world.hh

  • Committer: Package Import Robot
  • Author(s): Erich Schubert
  • Date: 2013-04-06 14:54:02 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20130406145402-jgjrtk7hac8gtvza
Tags: 1.20-dfsg.1-1
* New upstream release (Closes: #704595)
  (Repacked: dropped zipios++ source and main menu music)
* Update watch file, sf.net again.
* Fix documentation links (Closes: #653508)
* Conflict with enigma-level-previews to encourage deinstallation
  (Pregenerated level previews were only used with version 1.01)
* Use dh7 for building instead of CDBS
* Update to policy 3.9.4.0 (no changes)
* Register documentation with doc-base

Show diffs side-by-side

added added

removed removed

Lines of Context:
93
93
     * This structure stores all the information that is necessary to
94
94
     * handle collisions between stones and actors. 
95
95
     */
96
 
    struct StoneContact
97
 
    {
 
96
    struct StoneContact {
98
97
        // Variables.
99
98
        Actor           *actor;
100
99
        GridPos         stonepos;
112
111
        std::string sound;
113
112
 
114
113
        // Constructor.
115
 
//        StoneContact (Actor *a,
116
 
//                      GridPos stonepos,
117
 
//                      const V2 & contact_point,
118
 
//                      const V2 & surface_normal);
119
114
        StoneContact();
120
115
    };
121
116